Merge branch 'migrate-main-activity' into migrate-intro-about

# Conflicts:
#	app/src/main/kotlin/at/bitfire/davdroid/ui/MainActivity.kt

Author: ArnyminerZ

Diff for: .idea/copyright/LICENSE.xml

@@ -1,11 +1,7 @@
-# This is the list of significant contributors to DAVx5.
-#
-# This does not necessarily list everyone who has contributed work.
-# To see the full list of contributors, see the revision history in
-# source control.
+You can view the list of people who have contributed to the code base in the version control history:
+https://github.com/bitfireAT/davx5-ose/graphs/contributors
 
-Ricki Hirner (bitfire.at)
-Bernhard Stockmann (bitfire.at)
+Translators are not mentioned in the history explicitly.
+The list of translators can be found in the About screen.
 
-Sunik Kupfer (bitfire.at)
-Patrick Lang (techbee.at)
+Every contribution is welcome. There are many other forms of contributing besides writing code!

Diff for: .idea/copyright/profiles_settings.xml

@@ -19,8 +19,8 @@ android {
     defaultConfig {
         applicationId = "at.bitfire.davdroid"
 
-        versionCode = 404060000
-        versionName = "4.4.6-alpha.1"
+        versionCode = 404060001
+        versionName = "4.4.6-beta.1"
 
         setProperty("archivesBaseName", "davx5-ose-$versionName")
 

Diff for: AUTHORS

@@ -7,21 +7,4 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" android:maxSdkVersion="22"/>
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" android:maxSdkVersion="22"/>
 
-    <application>
-
-        <!-- test account type (without associated sync adapters) -->
-        <service
-            android:name="at.bitfire.davdroid.sync.account.TestAccountAuthenticator"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator"/>
-            </intent-filter>
-
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/test_account_authenticator"/>
-        </service>
-
-    </application>
-
 </manifest>

Diff for: app/build.gradle.kts

@@ -1,6 +1,6 @@
-/***************************************************************************************************
+/*
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
- **************************************************************************************************/
+ */
 
 package at.bitfire.davdroid
 

Diff for: app/src/androidTest/AndroidManifest.xml

@@ -1,3 +1,7 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
 package at.bitfire.davdroid
 
 import at.bitfire.davdroid.push.PushRegistrationWorkerManager

Diff for: app/src/androidTest/kotlin/at/bitfire/davdroid/Dav4jvm.kt

@@ -1,3 +1,7 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
 package at.bitfire.davdroid.repository
 
 import android.content.Context

Diff for: app/src/androidTest/kotlin/at/bitfire/davdroid/TestModules.kt

@@ -41,17 +41,17 @@ class DavHomeSetRepositoryTest {
         val entry1 = HomeSet(id=0, serviceId=serviceId, personal=true, url="https://example.com/1".toHttpUrl())
         val insertId1 = repository.insertOrUpdateByUrl(entry1)
         assertEquals(1L, insertId1)
-        assertEquals(entry1.apply { id = 1L }, repository.getById(1L))
+        assertEquals(entry1.copy(id = 1L), repository.getById(1L))
 
         val updatedEntry1 = HomeSet(id=0, serviceId=serviceId, personal=true, url="https://example.com/1".toHttpUrl(), displayName="Updated Entry")
         val updateId1 = repository.insertOrUpdateByUrl(updatedEntry1)
         assertEquals(1L, updateId1)
-        assertEquals(updatedEntry1.apply { id = 1L }, repository.getById(1L))
+        assertEquals(updatedEntry1.copy(id = 1L), repository.getById(1L))
 
         val entry2 = HomeSet(id=0, serviceId=serviceId, personal=true, url= "https://example.com/2".toHttpUrl())
         val insertId2 = repository.insertOrUpdateByUrl(entry2)
         assertEquals(2L, insertId2)
-        assertEquals(entry2.apply { id = 2L }, repository.getById(2L))
+        assertEquals(entry2.copy(id = 2L), repository.getById(2L))
     }
 
     @Test

Diff for: app/src/androidTest/kotlin/at/bitfire/davdroid/repository/DavCollectionRepositoryTest.kt

@@ -1,3 +1,7 @@
+/*
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ */
+
 package at.bitfire.davdroid.resource
 
 import android.accounts.Account

Diff for: app/src/androidTest/kotlin/at/bitfire/davdroid/repository/DavHomeSetRepositoryTest.kt

@@ -6,15 +6,13 @@ package at.bitfire.davdroid.resource
 
 import android.Manifest
 import android.accounts.Account
-import android.accounts.AccountManager
 import android.content.ContentProviderClient
 import android.content.ContentUris
 import android.content.Context
 import android.provider.ContactsContract
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import at.bitfire.vcard4android.Contact
-import at.bitfire.vcard4android.GroupMethod
 import at.bitfire.vcard4android.LabeledProperty
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -24,7 +22,7 @@ import org.junit.After
 import org.junit.AfterClass
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.BeforeClass
 import org.junit.ClassRule
@@ -36,16 +34,12 @@ import javax.inject.Inject
 @HiltAndroidTest
 class LocalAddressBookTest {
 
+    @Inject @ApplicationContext
+    lateinit var context: Context
+
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
 
-    @Inject
-    lateinit var addressbookFactory: LocalTestAddressBook.Factory
-
-    @Inject
-    @ApplicationContext
-    lateinit var context: Context
-
     val account = Account("Test Account", "Test Account Type")
     lateinit var addressBook: LocalTestAddressBook
 
@@ -54,15 +48,13 @@ class LocalAddressBookTest {
     fun setUp() {
         hiltRule.inject()
 
-        addressBook = addressbookFactory.create(account, provider, GroupMethod.CATEGORIES)
-        LocalTestAddressBook.createAccount(context)
+        addressBook = LocalTestAddressBook.create(context, account, provider)
     }
 
     @After
     fun tearDown() {
         // remove address book
-        val accountManager = AccountManager.get(context)
-        accountManager.removeAccountExplicitly(addressBook.addressBookAccount)
+        addressBook.remove()
     }
 
 
@@ -87,7 +79,7 @@ class LocalAddressBookTest {
         // rename address book
         val newName = "New Name"
         addressBook.renameAccount(newName)
-        assertEquals(Account(newName, LocalTestAddressBook.ACCOUNT.type), addressBook.addressBookAccount)
+        assertEquals(newName, addressBook.addressBookAccount.name)
 
         // check whether contact is still here (including data rows) and not dirty
         val result = addressBook.findContactById(id)
@@ -115,8 +107,8 @@ class LocalAddressBookTest {
 
         // rename address book
         val newName = "New Name"
-        addressBook.renameAccount(newName)
-        assertEquals(Account(newName, LocalTestAddressBook.ACCOUNT.type), addressBook.addressBookAccount)
+        assertTrue(addressBook.renameAccount(newName))
+        assertEquals(newName, addressBook.addressBookAccount.name)
 
         // check whether group is still here and not dirty
         val result = addressBook.findGroupById(id)
@@ -126,6 +118,7 @@ class LocalAddressBookTest {
         assertEquals("Test Group", group.displayName)
     }
 
+
     companion object {
 
         @JvmField
@@ -137,9 +130,8 @@ class LocalAddressBookTest {
         @BeforeClass
         @JvmStatic
         fun connect() {
-            val context = InstrumentationRegistry.getInstrumentation().targetContext
+            val context = InstrumentationRegistry.getInstrumentation().context
             provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
-            assertNotNull(provider)
         }
 
         @AfterClass

Diff for: app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalAddressBookStoreTest.kt

@@ -119,7 +119,7 @@ class LocalCalendarTest {
     }
 
     @Test
-    // Flaky, Needs single or rec init of CalendarProvider (InitCalendarProviderRule)
+    // Needs InitCalendarProviderRule
     fun testDeleteDirtyEventsWithoutInstances_Recurring_Instances() {
         val event = Event().apply {
             dtStart = DtStart("20220120T010203Z")

Diff for: app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalAddressBookTest.kt

@@ -12,7 +12,6 @@ import android.os.Build
 import android.provider.CalendarContract
 import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL
 import android.provider.CalendarContract.Events
-import androidx.datastore.dataStore
 import androidx.test.platform.app.InstrumentationRegistry
 import at.bitfire.davdroid.InitCalendarProviderRule
 import at.bitfire.ical4android.AndroidCalendar
@@ -41,29 +40,6 @@ import java.util.UUID
 
 class LocalEventTest {
 
-    companion object {
-
-        @JvmField
-        @ClassRule
-        val initCalendarProviderRule: TestRule = InitCalendarProviderRule.getInstance()
-
-        private lateinit var provider: ContentProviderClient
-
-        @BeforeClass
-        @JvmStatic
-        fun setUpClass() {
-            val context = InstrumentationRegistry.getInstrumentation().targetContext
-            provider = context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)!!
-        }
-
-        @AfterClass
-        @JvmStatic
-        fun tearDownClass() {
-            provider.closeCompat()
-        }
-
-    }
-
     private val account = Account("LocalCalendarTest", ACCOUNT_TYPE_LOCAL)
     private lateinit var calendar: LocalCalendar
 
@@ -482,4 +458,28 @@ class LocalEventTest {
         }
     }
 
-}
+
+    companion object {
+
+        @JvmField
+        @ClassRule
+        val initCalendarProviderRule: TestRule = InitCalendarProviderRule.getInstance()
+
+        private lateinit var provider: ContentProviderClient
+
+        @BeforeClass
+        @JvmStatic
+        fun setUpClass() {
+            val context = InstrumentationRegistry.getInstrumentation().targetContext
+            provider = context.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)!!
+        }
+
+        @AfterClass
+        @JvmStatic
+        fun tearDownClass() {
+            provider.closeCompat()
+        }
+
+    }
+
+}

Diff for: app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalCalendarTest.kt

@@ -21,6 +21,7 @@ import at.bitfire.vcard4android.GroupMethod
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.After
 import org.junit.AfterClass
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -37,39 +38,12 @@ import javax.inject.Inject
 @HiltAndroidTest
 class LocalGroupTest {
 
-    companion object {
-
-        @JvmField
-        @ClassRule
-        val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
-
-        private lateinit var provider: ContentProviderClient
-
-        @BeforeClass
-        @JvmStatic
-        fun connect() {
-            val context = InstrumentationRegistry.getInstrumentation().targetContext
-            provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
-            assertNotNull(provider)
-        }
-
-        @AfterClass
-        @JvmStatic
-        fun disconnect() {
-            provider.close()
-        }
-    }
+    @Inject @ApplicationContext
+    lateinit var context: Context
 
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
 
-    @Inject
-    @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var addressbookFactory: LocalTestAddressBook.Factory
-
     val account = Account("Test Account", "Test Account Type")
     private lateinit var addressBookGroupsAsCategories: LocalTestAddressBook
     private lateinit var addressBookGroupsAsVCards: LocalTestAddressBook
@@ -78,14 +52,20 @@ class LocalGroupTest {
     fun setup() {
         hiltRule.inject()
 
-        addressBookGroupsAsCategories = addressbookFactory.create(account, provider, GroupMethod.CATEGORIES)
-        addressBookGroupsAsVCards = addressbookFactory.create(account, provider, GroupMethod.GROUP_VCARDS)
+        addressBookGroupsAsCategories = LocalTestAddressBook.create(context, account, provider, GroupMethod.CATEGORIES)
+        addressBookGroupsAsVCards = LocalTestAddressBook.create(context, account, provider, GroupMethod.GROUP_VCARDS)
 
         // clear contacts
         addressBookGroupsAsCategories.clear()
         addressBookGroupsAsVCards.clear()
     }
 
+    @After
+    fun tearDown() {
+        addressBookGroupsAsCategories.remove()
+        addressBookGroupsAsVCards.remove()
+    }
+
 
     @Test
     fun testApplyPendingMemberships_addPendingMembership() {
@@ -279,4 +259,27 @@ class LocalGroupTest {
             add()
         }
 
+
+    companion object {
+
+        @JvmField
+        @ClassRule
+        val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
+
+        private lateinit var provider: ContentProviderClient
+
+        @BeforeClass
+        @JvmStatic
+        fun connect() {
+            val context = InstrumentationRegistry.getInstrumentation().context
+            provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
+        }
+
+        @AfterClass
+        @JvmStatic
+        fun disconnect() {
+            provider.close()
+        }
+    }
+
 }