Remove concept of main accounts

app/src/androidTest/kotlin/at/bitfire/davdroid/repository/AccountRepositoryTest.kt

@@ -0,0 +1,63 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
+package at.bitfire.davdroid.repository
+
+import android.accounts.Account
+import android.accounts.AccountManager
+import android.content.Context
+import at.bitfire.davdroid.R
+import at.bitfire.davdroid.settings.AccountSettings
+import at.bitfire.davdroid.settings.SettingsManager
+import at.bitfire.davdroid.sync.TasksAppManager
+import dagger.Lazy
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import io.mockk.mockk
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import java.util.logging.Logger
+import javax.inject.Inject
+
+@HiltAndroidTest
+class AccountRepositoryTest {
+
+    @get:Rule
+    val hiltRule = HiltAndroidRule(this)
+
+    @Inject
+    @ApplicationContext
+    lateinit var context: Context
+
+    private val addressBookAccountType by lazy { context.getString(R.string.account_type_address_book) }
+    private val addressBookAccount by lazy { Account("sub", addressBookAccountType) }
+
+    private val accountManager by lazy { AccountManager.get(context) }
+
+    private val collectionRepository = mockk<DavCollectionRepository>(relaxed = true)
+    private val serviceRepository = mockk<DavServiceRepository>(relaxed = true)
+    private val accountRepository by lazy { AccountRepository(
+        mockk<AccountSettings.Factory>(relaxed = true),
+        context,
+        collectionRepository,
+        mockk<DavHomeSetRepository>(relaxed = true),
+        mockk<Logger>(relaxed = true),
+        mockk<SettingsManager>(relaxed = true),
+        serviceRepository,
+        mockk<Lazy<TasksAppManager>>(relaxed = true),
+    ) }
+
+    @Before
+    fun setUp() {
+        hiltRule.inject()
+    }
+
+    @After
+    fun tearDown() {
+        accountManager.removeAccountExplicitly(addressBookAccount)
+    }
+
+}

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalGroupTest.kt

@@ -13,7 +13,6 @@ import android.provider.ContactsContract
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
-import at.bitfire.davdroid.settings.SettingsManager
 import at.bitfire.vcard4android.BatchOperation
 import at.bitfire.vcard4android.CachedGroupMembership
 import at.bitfire.vcard4android.Contact
@@ -68,7 +67,7 @@ class LocalGroupTest {
     lateinit var context: Context
 
     @Inject
-    lateinit var settingsManager: SettingsManager
+    lateinit var addressbookFactory: LocalTestAddressBook.Factory
 
 
     private lateinit var addressBookGroupsAsCategories: LocalTestAddressBook
@@ -78,8 +77,8 @@ class LocalGroupTest {
     fun setup() {
         hiltRule.inject()
 
-        addressBookGroupsAsCategories = LocalTestAddressBook(context, provider, GroupMethod.CATEGORIES)
-        addressBookGroupsAsVCards = LocalTestAddressBook(context, provider, GroupMethod.GROUP_VCARDS)
+        addressBookGroupsAsCategories = addressbookFactory.create(provider, GroupMethod.CATEGORIES)
+        addressBookGroupsAsVCards = addressbookFactory.create(provider, GroupMethod.GROUP_VCARDS)
 
         // clear contacts
         addressBookGroupsAsCategories.clear()

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalTestAddressBook.kt

@@ -7,21 +7,34 @@ package at.bitfire.davdroid.resource
 import android.accounts.Account
 import android.content.ContentProviderClient
 import android.content.Context
+import at.bitfire.davdroid.repository.DavCollectionRepository
+import at.bitfire.davdroid.repository.DavServiceRepository
+import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.vcard4android.GroupMethod
-
-class LocalTestAddressBook(
-    context: Context,
-    provider: ContentProviderClient,
-    override val groupMethod: GroupMethod
-): LocalAddressBook(context, ACCOUNT, provider) {
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import dagger.hilt.android.qualifiers.ApplicationContext
+import java.util.logging.Logger
+
+class LocalTestAddressBook @AssistedInject constructor(
+    @Assisted provider: ContentProviderClient,
+    @Assisted override val groupMethod: GroupMethod,
+    @ApplicationContext context: Context,
+    accountSettingsFactory: AccountSettings.Factory,
+    collectionRepository: DavCollectionRepository,
+    logger: Logger,
+    serviceRepository: DavServiceRepository
+): LocalAddressBook(ACCOUNT, provider, context, accountSettingsFactory, collectionRepository, logger, serviceRepository) {
 
     companion object {
         val ACCOUNT = Account("LocalTestAddressBook", "at.bitfire.davdroid.test")
     }
 
-    override var mainAccount: Account?
-        get() = throw NotImplementedError()
-        set(_) = throw NotImplementedError()
+    @AssistedFactory
+    interface Factory {
+        fun create(provider: ContentProviderClient, groupMethod: GroupMethod): LocalTestAddressBook
+    }
 
     override var readOnly: Boolean
         get() = false

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/CachedGroupMembershipHandlerTest.kt

@@ -55,6 +55,9 @@ class CachedGroupMembershipHandlerTest {
     }
 
 
+    @Inject
+    lateinit var addressbookFactory: LocalTestAddressBook.Factory
+
     @Inject
     @ApplicationContext
     lateinit var context: Context
@@ -70,7 +73,7 @@ class CachedGroupMembershipHandlerTest {
 
     @Test
     fun testMembership() {
-        val addressBook = LocalTestAddressBook(context, provider, GroupMethod.GROUP_VCARDS)
+        val addressBook = addressbookFactory.create(provider, GroupMethod.GROUP_VCARDS)
 
         val contact = Contact()
         val localContact = LocalContact(addressBook, contact, null, null, 0)

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/GroupMembershipBuilderTest.kt

@@ -56,6 +56,9 @@ class GroupMembershipBuilderTest {
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
 
+    @Inject
+    lateinit var addressbookFactory: LocalTestAddressBook.Factory
+
     @Inject
     @ApplicationContext
     lateinit var context: Context
@@ -71,7 +74,7 @@ class GroupMembershipBuilderTest {
         val contact = Contact().apply {
             categories += "TEST GROUP"
         }
-        val addressBookGroupsAsCategories = LocalTestAddressBook(context, provider, GroupMethod.CATEGORIES)
+        val addressBookGroupsAsCategories = addressbookFactory.create(provider, GroupMethod.CATEGORIES)
         GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsCategories, false).build().also { result ->
             assertEquals(1, result.size)
             assertEquals(GroupMembership.CONTENT_ITEM_TYPE, result[0].values[GroupMembership.MIMETYPE])
@@ -84,7 +87,7 @@ class GroupMembershipBuilderTest {
         val contact = Contact().apply {
             categories += "TEST GROUP"
         }
-        val addressBookGroupsAsVCards = LocalTestAddressBook(context, provider, GroupMethod.GROUP_VCARDS)
+        val addressBookGroupsAsVCards = addressbookFactory.create(provider, GroupMethod.GROUP_VCARDS)
         GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsVCards, false).build().also { result ->
             // group membership is constructed during post-processing
             assertEquals(0, result.size)

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/GroupMembershipHandlerTest.kt

@@ -57,6 +57,9 @@ class GroupMembershipHandlerTest {
 
     }
 
+    @Inject
+    lateinit var addressbookFactory: LocalTestAddressBook.Factory
+
     @Inject @ApplicationContext
     lateinit var context: Context
 
@@ -71,7 +74,7 @@ class GroupMembershipHandlerTest {
 
     @Test
     fun testMembership_GroupsAsCategories() {
-        val addressBookGroupsAsCategories = LocalTestAddressBook(context, provider, GroupMethod.CATEGORIES)
+        val addressBookGroupsAsCategories = addressbookFactory.create(provider, GroupMethod.CATEGORIES)
         val addressBookGroupsAsCategoriesGroup = addressBookGroupsAsCategories.findOrCreateGroup("TEST GROUP")
 
         val contact = Contact()
@@ -87,7 +90,7 @@ class GroupMembershipHandlerTest {
 
     @Test
     fun testMembership_GroupsAsVCards() {
-        val addressBookGroupsAsVCards = LocalTestAddressBook(context, provider, GroupMethod.GROUP_VCARDS)
+        val addressBookGroupsAsVCards = addressbookFactory.create(provider, GroupMethod.GROUP_VCARDS)
 
         val contact = Contact()
         val localContact = LocalContact(addressBookGroupsAsVCards, contact, null, null, 0)

app/src/androidTest/kotlin/at/bitfire/davdroid/sync/SyncManagerTest.kt

@@ -522,7 +522,7 @@ class SyncManagerTest {
         }
     ) = syncManagerFactory.create(
         account,
-        accountSettingsFactory.forAccount(account),
+        accountSettingsFactory.create(account),
         arrayOf(),
         "TestAuthority",
         HttpClient.Builder(context).build(),

app/src/main/kotlin/at/bitfire/davdroid/push/PushRegistrationWorker.kt

@@ -99,7 +99,7 @@ class PushRegistrationWorker @AssistedInject constructor(
     }
 
     private suspend fun registerPushSubscription(collection: Collection, account: Account, endpoint: String) {
-        val settings = accountSettingsFactory.forAccount(account)
+        val settings = accountSettingsFactory.create(account)
 
         runInterruptible {
             HttpClient.Builder(applicationContext, settings)
@@ -158,7 +158,7 @@ class PushRegistrationWorker @AssistedInject constructor(
     }
 
     private suspend fun unregisterPushSubscription(collection: Collection, account: Account, url: HttpUrl) {
-        val settings = accountSettingsFactory.forAccount(account)
+        val settings = accountSettingsFactory.create(account)
 
         runInterruptible {
             HttpClient.Builder(applicationContext, settings)