refactor: Move AccountManager to core.data.repository (#976)

app/build.gradle.kts

@@ -121,7 +121,6 @@ dependencies {
     implementation(libs.androidx.hilt.work)
     ksp(libs.androidx.hilt.compiler)
 
-    implementation(projects.core.accounts)
     implementation(projects.core.activity)
     implementation(projects.core.common)
     implementation(projects.core.data)

app/src/main/java/app/pachli/appstore/CacheUpdater.kt

@@ -1,6 +1,6 @@
 package app.pachli.appstore
 
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.dao.TimelineDao
 import app.pachli.core.network.model.Poll
 import com.squareup.moshi.Moshi

app/src/main/java/app/pachli/components/account/AccountViewModel.kt

@@ -9,7 +9,7 @@ import app.pachli.appstore.EventHub
 import app.pachli.appstore.MuteEvent
 import app.pachli.appstore.ProfileEditedEvent
 import app.pachli.appstore.UnfollowEvent
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.network.model.Account
 import app.pachli.core.network.model.Relationship
 import app.pachli.core.network.retrofit.MastodonApi
@@ -137,7 +137,8 @@ class AccountViewModel @Inject constructor(
 
     fun changeSubscribingState() {
         val relationship = relationshipData.value?.data
-        if (relationship?.notifying == true || // Mastodon 3.3.0rc1
+        if (relationship?.notifying == true ||
+            // Mastodon 3.3.0rc1
             relationship?.subscribing == true // Pleroma
         ) {
             changeRelationship(RelationShipAction.UNSUBSCRIBE)

app/src/main/java/app/pachli/components/account/media/AccountMediaViewModel.kt

@@ -22,7 +22,7 @@ import androidx.paging.ExperimentalPagingApi
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.StatusDisplayOptionsRepository
 import app.pachli.core.navigation.AttachmentViewData
 import app.pachli.core.network.retrofit.MastodonApi

app/src/main/java/app/pachli/components/accountlist/AccountListFragment.kt

@@ -31,13 +31,13 @@ import app.pachli.components.accountlist.adapter.FollowAdapter
 import app.pachli.components.accountlist.adapter.FollowRequestsAdapter
 import app.pachli.components.accountlist.adapter.FollowRequestsHeaderAdapter
 import app.pachli.components.accountlist.adapter.MutesAdapter
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.activity.BottomSheetActivity
 import app.pachli.core.activity.PostLookupFallbackBehavior
 import app.pachli.core.activity.extensions.startActivityWithDefaultTransition
 import app.pachli.core.common.extensions.hide
 import app.pachli.core.common.extensions.show
 import app.pachli.core.common.extensions.viewBinding
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.navigation.AccountActivityIntent
 import app.pachli.core.navigation.AccountListActivityIntent.Kind
 import app.pachli.core.navigation.AccountListActivityIntent.Kind.BLOCKS

app/src/main/java/app/pachli/components/compose/ComposeViewModel.kt

@@ -30,10 +30,10 @@ import app.pachli.components.compose.ComposeActivity.QueuedMedia
 import app.pachli.components.compose.ComposeAutoCompleteAdapter.AutocompleteResult
 import app.pachli.components.drafts.DraftHelper
 import app.pachli.components.search.SearchType
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.PachliError
 import app.pachli.core.common.string.mastodonLength
 import app.pachli.core.common.string.randomAlphanumericString
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.InstanceInfoRepository
 import app.pachli.core.navigation.ComposeActivityIntent.ComposeOptions
 import app.pachli.core.navigation.ComposeActivityIntent.ComposeOptions.ComposeKind

app/src/main/java/app/pachli/components/conversation/ConversationsRemoteMediator.kt

@@ -4,7 +4,7 @@ import androidx.paging.ExperimentalPagingApi
 import androidx.paging.LoadType
 import androidx.paging.PagingState
 import androidx.paging.RemoteMediator
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.dao.ConversationsDao
 import app.pachli.core.database.di.TransactionProvider
 import app.pachli.core.database.model.ConversationEntity

app/src/main/java/app/pachli/components/conversation/ConversationsViewModel.kt

@@ -23,7 +23,7 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
 import androidx.paging.map
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.Converters
 import app.pachli.core.database.dao.ConversationsDao
 import app.pachli.core.database.di.TransactionProvider

app/src/main/java/app/pachli/components/drafts/DraftsViewModel.kt

@@ -21,7 +21,7 @@ import androidx.lifecycle.viewModelScope
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.dao.DraftDao
 import app.pachli.core.database.model.DraftEntity
 import app.pachli.core.network.model.Status

app/src/main/java/app/pachli/components/notifications/NotificationFetcher.kt

@@ -20,9 +20,9 @@ package app.pachli.components.notifications
 import android.app.NotificationManager
 import android.content.Context
 import androidx.annotation.WorkerThread
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.activity.NotificationConfig
 import app.pachli.core.common.string.isLessThan
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.network.model.Links
 import app.pachli.core.network.model.Marker

app/src/main/java/app/pachli/components/notifications/NotificationsViewModel.kt

@@ -30,8 +30,8 @@ import app.pachli.appstore.BlockEvent
 import app.pachli.appstore.EventHub
 import app.pachli.appstore.MuteConversationEvent
 import app.pachli.appstore.MuteEvent
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.extensions.throttleFirst
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.ContentFilterVersion
 import app.pachli.core.data.repository.ContentFiltersRepository
 import app.pachli.core.data.repository.StatusDisplayOptionsRepository

app/src/main/java/app/pachli/components/notifications/PushNotificationHelper.kt

@@ -20,8 +20,8 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
 import androidx.appcompat.app.AlertDialog
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.activity.NotificationConfig
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.network.model.Notification
 import app.pachli.core.network.retrofit.MastodonApi

app/src/main/java/app/pachli/components/notifications/domain/AndroidNotificationsAreEnabledUseCase.kt

@@ -20,8 +20,8 @@ package app.pachli.components.notifications.domain
 import android.app.NotificationManager
 import android.content.Context
 import android.os.Build
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.activity.NotificationConfig
+import app.pachli.core.data.repository.AccountManager
 import java.util.Locale
 import javax.inject.Inject
 import timber.log.Timber

app/src/main/java/app/pachli/components/notifications/domain/EnableAllNotificationsUseCase.kt

@@ -23,8 +23,8 @@ import app.pachli.components.notifications.chooseUnifiedPushDistributor
 import app.pachli.components.notifications.disableAllNotifications
 import app.pachli.components.notifications.enablePullNotifications
 import app.pachli.components.notifications.hasPushScope
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.activity.NotificationConfig
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.network.retrofit.MastodonApi
 import app.pachli.core.preferences.PrefKeys
 import javax.inject.Inject

app/src/main/java/app/pachli/components/preference/AccountPreferencesFragment.kt

@@ -30,10 +30,10 @@ import app.pachli.BuildConfig
 import app.pachli.R
 import app.pachli.appstore.EventHub
 import app.pachli.components.notifications.activeAccountNeedsPushScope
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.activity.extensions.TransitionKind
 import app.pachli.core.activity.extensions.startActivityWithTransition
 import app.pachli.core.common.util.unsafeLazy
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.AccountPreferenceDataStore
 import app.pachli.core.data.repository.ContentFiltersRepository
 import app.pachli.core.designsystem.R as DR

app/src/main/java/app/pachli/components/preference/NotificationPreferencesFragment.kt

@@ -22,7 +22,7 @@ import app.pachli.R
 import app.pachli.components.notifications.disablePullNotifications
 import app.pachli.components.notifications.domain.AndroidNotificationsAreEnabledUseCase
 import app.pachli.components.notifications.enablePullNotifications
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.preferences.PrefKeys
 import app.pachli.settings.makePreferenceScreen

app/src/main/java/app/pachli/components/preference/PreferencesFragment.kt

@@ -42,11 +42,11 @@ import app.pachli.components.notifications.AppNotificationMethod
 import app.pachli.components.notifications.getApplicationLabel
 import app.pachli.components.notifications.hasPushScope
 import app.pachli.components.notifications.notificationMethod
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.activity.NotificationConfig
 import app.pachli.core.common.extensions.hide
 import app.pachli.core.common.extensions.show
 import app.pachli.core.common.util.unsafeLazy
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.designsystem.R as DR
 import app.pachli.core.network.model.Notification

app/src/main/java/app/pachli/components/report/fragments/ReportStatusesFragment.kt

@@ -37,9 +37,9 @@ import app.pachli.components.report.ReportViewModel
 import app.pachli.components.report.Screen
 import app.pachli.components.report.adapter.AdapterHandler
 import app.pachli.components.report.adapter.StatusesAdapter
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.extensions.viewBinding
 import app.pachli.core.common.extensions.visible
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.navigation.AccountActivityIntent
 import app.pachli.core.navigation.AttachmentViewData
 import app.pachli.core.navigation.TimelineActivityIntent

app/src/main/java/app/pachli/components/search/SearchViewModel.kt

@@ -33,7 +33,7 @@ import app.pachli.components.search.SearchOperator.IsSensitiveOperator
 import app.pachli.components.search.SearchOperator.LanguageOperator
 import app.pachli.components.search.SearchOperator.WhereOperator
 import app.pachli.components.search.adapter.SearchPagingSourceFactory
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.ServerRepository
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.model.ServerOperation.ORG_JOINMASTODON_SEARCH_QUERY_BY_DATE

app/src/main/java/app/pachli/components/timeline/CachedTimelineRepository.kt

@@ -23,8 +23,8 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import app.pachli.components.timeline.viewmodel.CachedTimelineRemoteMediator
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.di.ApplicationScope
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.dao.RemoteKeyDao
 import app.pachli.core.database.dao.TimelineDao
 import app.pachli.core.database.dao.TranslatedStatusDao

app/src/main/java/app/pachli/components/timeline/NetworkTimelineRepository.kt

@@ -26,7 +26,7 @@ import androidx.paging.PagingSource
 import app.pachli.components.timeline.viewmodel.NetworkTimelinePagingSource
 import app.pachli.components.timeline.viewmodel.NetworkTimelineRemoteMediator
 import app.pachli.components.timeline.viewmodel.PageCache
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.model.Timeline
 import app.pachli.core.network.model.Status
 import app.pachli.core.network.retrofit.MastodonApi

app/src/main/java/app/pachli/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt

@@ -24,7 +24,7 @@ import androidx.paging.LoadType
 import androidx.paging.PagingState
 import androidx.paging.RemoteMediator
 import androidx.room.Transaction
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.dao.RemoteKeyDao
 import app.pachli.core.database.dao.TimelineDao
 import app.pachli.core.database.di.TransactionProvider

app/src/main/java/app/pachli/components/timeline/viewmodel/CachedTimelineViewModel.kt

@@ -30,7 +30,7 @@ import app.pachli.appstore.FavoriteEvent
 import app.pachli.appstore.PinEvent
 import app.pachli.appstore.ReblogEvent
 import app.pachli.components.timeline.CachedTimelineRepository
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.ContentFiltersRepository
 import app.pachli.core.data.repository.StatusDisplayOptionsRepository
 import app.pachli.core.network.model.FilterAction

app/src/main/java/app/pachli/components/timeline/viewmodel/NetworkTimelineRemoteMediator.kt

@@ -23,7 +23,7 @@ import androidx.paging.LoadType
 import androidx.paging.PagingState
 import androidx.paging.RemoteMediator
 import app.pachli.BuildConfig
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.model.Timeline
 import app.pachli.core.network.model.Status
 import app.pachli.core.network.retrofit.MastodonApi

app/src/main/java/app/pachli/components/timeline/viewmodel/NetworkTimelineViewModel.kt

@@ -30,7 +30,7 @@ import app.pachli.appstore.FavoriteEvent
 import app.pachli.appstore.PinEvent
 import app.pachli.appstore.ReblogEvent
 import app.pachli.components.timeline.NetworkTimelineRepository
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.ContentFiltersRepository
 import app.pachli.core.data.repository.StatusDisplayOptionsRepository
 import app.pachli.core.network.model.FilterAction

app/src/main/java/app/pachli/components/timeline/viewmodel/TimelineViewModel.kt

@@ -41,8 +41,8 @@ import app.pachli.appstore.StatusComposedEvent
 import app.pachli.appstore.StatusDeletedEvent
 import app.pachli.appstore.StatusEditedEvent
 import app.pachli.appstore.UnfollowEvent
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.extensions.throttleFirst
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.ContentFilterVersion
 import app.pachli.core.data.repository.ContentFiltersRepository
 import app.pachli.core.data.repository.StatusDisplayOptionsRepository

app/src/main/java/app/pachli/components/trending/viewmodel/TrendingLinksViewModel.kt

@@ -20,8 +20,8 @@ package app.pachli.components.trending.viewmodel
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.pachli.components.trending.TrendingLinksRepository
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.extensions.throttleFirst
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.StatusDisplayOptionsRepository
 import app.pachli.core.network.model.TrendsLink
 import app.pachli.core.preferences.PrefKeys

app/src/main/java/app/pachli/components/viewthread/ViewThreadViewModel.kt

@@ -29,7 +29,7 @@ import app.pachli.appstore.StatusDeletedEvent
 import app.pachli.appstore.StatusEditedEvent
 import app.pachli.components.timeline.CachedTimelineRepository
 import app.pachli.components.timeline.util.ifExpected
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.ContentFilterVersion
 import app.pachli.core.data.repository.ContentFiltersRepository
 import app.pachli.core.data.repository.StatusDisplayOptionsRepository

app/src/main/java/app/pachli/db/DraftsAlert.kt

@@ -23,7 +23,7 @@ import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import app.pachli.R
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.dao.DraftDao
 import app.pachli.core.navigation.DraftsActivityIntent
 import javax.inject.Inject

app/src/main/java/app/pachli/fragment/SFragment.kt

@@ -38,13 +38,13 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import app.pachli.R
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.activity.AccountSelectionListener
 import app.pachli.core.activity.BaseActivity
 import app.pachli.core.activity.BottomSheetActivity
 import app.pachli.core.activity.PostLookupFallbackBehavior
 import app.pachli.core.activity.extensions.startActivityWithDefaultTransition
 import app.pachli.core.activity.openLink
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.ServerRepository
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.database.model.TranslationState

app/src/main/java/app/pachli/receiver/SendStatusBroadcastReceiver.kt

@@ -37,8 +37,8 @@ import app.pachli.components.notifications.KEY_SENDER_ACCOUNT_IDENTIFIER
 import app.pachli.components.notifications.KEY_SPOILER
 import app.pachli.components.notifications.KEY_VISIBILITY
 import app.pachli.components.notifications.REPLY_ACTION
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.string.randomAlphanumericString
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.designsystem.R as DR
 import app.pachli.core.network.model.Status
 import app.pachli.service.SendStatusService

app/src/main/java/app/pachli/receiver/UnifiedPushBroadcastReceiver.kt

@@ -24,7 +24,7 @@ import androidx.work.OutOfQuotaPolicy
 import androidx.work.WorkManager
 import app.pachli.components.notifications.disablePushNotificationsForAccount
 import app.pachli.components.notifications.registerUnifiedPushEndpoint
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.network.retrofit.MastodonApi
 import app.pachli.worker.NotificationWorker
 import dagger.hilt.android.AndroidEntryPoint

app/src/main/java/app/pachli/service/SendStatusService.kt

@@ -26,8 +26,8 @@ import app.pachli.appstore.StatusScheduledEvent
 import app.pachli.components.compose.MediaUploader
 import app.pachli.components.drafts.DraftHelper
 import app.pachli.components.notifications.pendingIntentFlags
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.util.unsafeLazy
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.designsystem.R as DR
 import app.pachli.core.navigation.MainActivityIntent
 import app.pachli.core.network.model.Attachment

app/src/main/java/app/pachli/usecase/LogoutUseCase.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import app.pachli.components.drafts.DraftHelper
 import app.pachli.components.notifications.deleteNotificationChannelsForAccount
 import app.pachli.components.notifications.disablePushNotificationsForAccount
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.dao.ConversationsDao
 import app.pachli.core.database.dao.RemoteKeyDao
 import app.pachli.core.database.dao.TimelineDao

app/src/main/java/app/pachli/util/ShareShortcutHelper.kt

@@ -26,7 +26,7 @@ import androidx.core.app.Person
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.designsystem.R as DR
 import app.pachli.core.navigation.MainActivityIntent

app/src/main/java/app/pachli/worker/PruneCacheWorker.kt

@@ -26,7 +26,7 @@ import androidx.work.WorkerParameters
 import app.pachli.R
 import app.pachli.components.notifications.NOTIFICATION_ID_PRUNE_CACHE
 import app.pachli.components.notifications.createWorkerNotification
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.dao.TimelineDao
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject

app/src/test/java/app/pachli/MainActivityTest.kt

@@ -29,7 +29,7 @@ import app.pachli.components.accountlist.AccountListActivity
 import app.pachli.components.compose.HiltTestApplication_Application
 import app.pachli.components.notifications.createNotificationChannelsForAccount
 import app.pachli.components.notifications.makeNotification
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.database.model.defaultTabs
 import app.pachli.core.model.Timeline

app/src/test/java/app/pachli/components/compose/ComposeActivityTest.kt

@@ -22,9 +22,9 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.pachli.PachliApplication
 import app.pachli.R
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.data.model.InstanceInfo.Companion.DEFAULT_CHARACTERS_RESERVED_PER_URL
 import app.pachli.core.data.model.InstanceInfo.Companion.DEFAULT_CHARACTER_LIMIT
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.InstanceInfoRepository
 import app.pachli.core.navigation.ComposeActivityIntent
 import app.pachli.core.navigation.ComposeActivityIntent.ComposeOptions

app/src/test/java/app/pachli/components/notifications/NotificationsViewModelTestBase.kt

@@ -20,7 +20,7 @@ package app.pachli.components.notifications
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import app.pachli.appstore.EventHub
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.AccountPreferenceDataStore
 import app.pachli.core.data.repository.ContentFilters
 import app.pachli.core.data.repository.ContentFiltersError

app/src/test/java/app/pachli/components/timeline/CachedTimelineRemoteMediatorTest.kt

@@ -12,7 +12,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import app.pachli.components.timeline.viewmodel.CachedTimelineRemoteMediator
 import app.pachli.components.timeline.viewmodel.CachedTimelineRemoteMediator.Companion.TIMELINE_ID
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.AppDatabase
 import app.pachli.core.database.Converters
 import app.pachli.core.database.di.TransactionProvider

app/src/test/java/app/pachli/components/timeline/CachedTimelineViewModelTestBase.kt

@@ -24,7 +24,7 @@ import app.pachli.PachliApplication
 import app.pachli.appstore.EventHub
 import app.pachli.components.timeline.viewmodel.CachedTimelineViewModel
 import app.pachli.components.timeline.viewmodel.TimelineViewModel
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.ContentFiltersRepository
 import app.pachli.core.data.repository.StatusDisplayOptionsRepository
 import app.pachli.core.model.Timeline

app/src/test/java/app/pachli/components/timeline/NetworkTimelineRemoteMediatorTest.kt

@@ -28,7 +28,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.pachli.components.timeline.viewmodel.NetworkTimelineRemoteMediator
 import app.pachli.components.timeline.viewmodel.Page
 import app.pachli.components.timeline.viewmodel.PageCache
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.model.Timeline
 import app.pachli.core.network.model.Status

app/src/test/java/app/pachli/components/timeline/NetworkTimelineViewModelTestBase.kt

@@ -23,7 +23,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import app.pachli.appstore.EventHub
 import app.pachli.components.timeline.viewmodel.NetworkTimelineViewModel
 import app.pachli.components.timeline.viewmodel.TimelineViewModel
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.ContentFiltersRepository
 import app.pachli.core.data.repository.StatusDisplayOptionsRepository
 import app.pachli.core.model.Timeline

app/src/test/java/app/pachli/components/viewthread/ViewThreadViewModelTest.kt

@@ -11,7 +11,7 @@ import app.pachli.components.compose.HiltTestApplication_Application
 import app.pachli.components.timeline.CachedTimelineRepository
 import app.pachli.components.timeline.mockStatus
 import app.pachli.components.timeline.mockStatusViewData
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.ContentFilters
 import app.pachli.core.data.repository.ContentFiltersError
 import app.pachli.core.data.repository.ContentFiltersRepository

app/src/test/java/app/pachli/util/StatusDisplayOptionsRepositoryTest.kt

@@ -21,8 +21,8 @@ import androidx.core.content.edit
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.cash.turbine.test
 import app.pachli.PachliApplication
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.data.model.StatusDisplayOptions
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.AccountPreferenceDataStore
 import app.pachli.core.data.repository.StatusDisplayOptionsRepository
 import app.pachli.core.network.model.Account

core/accounts/build.gradle.kts

@@ -1,43 +0,0 @@
-/*
- * Copyright 2023 Pachli Association
- *
- * This file is a part of Pachli.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Pachli is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Pachli; if not,
- * see <http://www.gnu.org/licenses>.
- */
-
-plugins {
-    alias(libs.plugins.pachli.android.library)
-    alias(libs.plugins.pachli.android.hilt)
-}
-
-android {
-    namespace = "app.pachli.core.accounts"
-
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-}
-
-dependencies {
-    // Depends on the okhttp3.Interceptor type
-    // class app.pachli.core.network.retrofit.InstanceSwitchAuthInterceptor, unresolved supertypes: okhttp3.Interceptor
-    compileOnly(libs.bundles.okhttp)
-
-    // AccountManager exposes AccountEntity as part of its public API
-    // TODO: This should be wrapped in a type from this module to prevent this
-    api(projects.core.database)
-
-    implementation(projects.core.common)
-    implementation(projects.core.network)
-    implementation(projects.core.preferences)
-}

core/accounts/lint-baseline.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.2)" variant="all" version="8.1.2">
-
-</issues>

core/accounts/src/main/kotlin/AndroidManifest.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2023 Pachli Association
-  ~
-  ~ This file is a part of Pachli.
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under the terms of the
-  ~ GNU General Public License as published by the Free Software Foundation; either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ Pachli is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-  ~ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-  ~ Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with Pachli; if not,
-  ~ see <http://www.gnu.org/licenses>.
-  -->
-
-<manifest>
-
-</manifest>

core/activity/build.gradle.kts

@@ -31,8 +31,9 @@ android {
 
 dependencies {
     // BaseActivity exposes AccountManager as an injected property
-    api(projects.core.accounts)
+    api(projects.core.database)
 
+    api(projects.core.data)
     implementation(projects.core.common)
     implementation(projects.core.designsystem)
     implementation(projects.core.navigation)

core/activity/src/main/kotlin/app/pachli/core/activity/BaseActivity.kt

@@ -36,10 +36,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.MenuProvider
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.activity.extensions.canOverrideActivityTransitions
 import app.pachli.core.activity.extensions.getTransitionKind
 import app.pachli.core.activity.extensions.startActivityWithDefaultTransition
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.designsystem.EmbeddedFontFamily
 import app.pachli.core.designsystem.R as DR

core/data/build.gradle.kts

@@ -30,7 +30,6 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.accounts)
     implementation(projects.core.common)
     implementation(projects.core.database)
     implementation(projects.core.model)

core/data/src/main/kotlin/app/pachli/core/data/repository/AccountManager.kt

@@ -15,7 +15,7 @@
  * see <http://www.gnu.org/licenses>.
  */
 
-package app.pachli.core.accounts
+package app.pachli.core.data.repository
 
 import android.content.Context
 import app.pachli.core.common.di.ApplicationScope

core/data/src/main/kotlin/app/pachli/core/data/repository/AccountPreferenceDataStore.kt

@@ -18,7 +18,6 @@
 package app.pachli.core.data.repository
 
 import androidx.preference.PreferenceDataStore
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.di.ApplicationScope
 import app.pachli.core.preferences.PrefKeys
 import javax.inject.Inject

core/data/src/main/kotlin/app/pachli/core/data/repository/InstanceInfoRepository.kt

@@ -18,7 +18,6 @@
 package app.pachli.core.data.repository
 
 import androidx.annotation.VisibleForTesting
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.di.ApplicationScope
 import app.pachli.core.data.model.InstanceInfo
 import app.pachli.core.data.model.InstanceInfo.Companion.DEFAULT_CHARACTERS_RESERVED_PER_URL

core/data/src/main/kotlin/app/pachli/core/data/repository/NetworkListsRepository.kt

@@ -17,7 +17,6 @@
 
 package app.pachli.core.data.repository
 
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.di.ApplicationScope
 import app.pachli.core.data.repository.ListsError.Create
 import app.pachli.core.data.repository.ListsError.Delete

core/data/src/main/kotlin/app/pachli/core/data/repository/ServerRepository.kt

@@ -18,7 +18,6 @@
 package app.pachli.core.data.repository
 
 import androidx.annotation.StringRes
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.PachliError
 import app.pachli.core.common.di.ApplicationScope
 import app.pachli.core.data.R

core/data/src/main/kotlin/app/pachli/core/data/repository/StatusDisplayOptionsRepository.kt

@@ -19,7 +19,6 @@ package app.pachli.core.data.repository
 
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.VisibleForTesting.Companion.PRIVATE
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.common.di.ApplicationScope
 import app.pachli.core.data.model.StatusDisplayOptions
 import app.pachli.core.database.model.AccountEntity

core/data/src/test/kotlin/app/pachli/core/data/repository/InstanceInfoRepositoryTest.kt

@@ -20,7 +20,6 @@ package app.pachli.core.data.repository
 import android.app.Application
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.cash.turbine.test
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.data.model.InstanceInfo.Companion.DEFAULT_CHARACTER_LIMIT
 import app.pachli.core.network.model.Account
 import app.pachli.core.network.model.InstanceConfiguration

core/domain/build.gradle.kts

@@ -29,6 +29,6 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.accounts)
+    implementation(projects.core.data)
     implementation(projects.core.preferences)
 }

feature/about/src/main/kotlin/app/pachli/feature/about/AboutFragmentViewModel.kt

@@ -20,7 +20,7 @@ package app.pachli.feature.about
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
-import app.pachli.core.accounts.AccountManager
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.core.data.repository.InstanceInfoRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject

feature/about/src/main/kotlin/app/pachli/feature/about/NotificationDetailsFragment.kt

@@ -41,13 +41,13 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import androidx.work.WorkInfo
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.activity.NotificationConfig
 import app.pachli.core.activity.RefreshableFragment
 import app.pachli.core.common.extensions.hide
 import app.pachli.core.common.extensions.show
 import app.pachli.core.common.extensions.viewBinding
 import app.pachli.core.common.extensions.visible
+import app.pachli.core.data.repository.AccountManager
 import app.pachli.feature.about.databinding.FragmentNotificationDetailsBinding
 import app.pachli.feature.about.databinding.ItemUsageEventBinding
 import app.pachli.feature.about.databinding.ItemWorkInfoBinding

feature/about/src/main/kotlin/app/pachli/feature/about/NotificationViewModel.kt

@@ -26,8 +26,8 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
-import app.pachli.core.accounts.AccountManager
 import app.pachli.core.activity.NotificationConfig
+import app.pachli.core.data.repository.AccountManager
 import com.github.michaelbull.result.Err
 import com.github.michaelbull.result.Ok
 import dagger.hilt.android.lifecycle.HiltViewModel

settings.gradle.kts

@@ -50,7 +50,6 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 rootProject.name = "pachli-android"
 
 include(":app")
-include(":core:accounts")
 include(":core:activity")
 include(":core:common")
 include(":core:data")