Disallow subclassing of DmfsTaskList (#160)

Author: sunkup

lib/src/androidTest/kotlin/at/bitfire/ical4android/DmfsTaskListTest.kt

@@ -11,7 +11,6 @@ import android.content.ContentUris
 import android.content.ContentValues
 import android.database.DatabaseUtils
 import android.provider.CalendarContract
-import at.bitfire.ical4android.impl.TestTaskList
 import net.fortuna.ical4j.model.property.RelatedTo
 import org.dmfs.tasks.contract.TaskContract
 import org.dmfs.tasks.contract.TaskContract.Properties
@@ -28,7 +27,7 @@ class DmfsTaskListTest(providerName: TaskProvider.ProviderName):
     private val testAccount = Account(javaClass.name, CalendarContract.ACCOUNT_TYPE_LOCAL)
 
 
-    private fun createTaskList(): TestTaskList {
+    private fun createTaskList(): DmfsTaskList {
         val info = ContentValues()
         info.put(TaskContract.TaskLists.LIST_NAME, "Test Task List")
         info.put(TaskContract.TaskLists.LIST_COLOR, 0xffff0000)
@@ -39,7 +38,7 @@ class DmfsTaskListTest(providerName: TaskProvider.ProviderName):
         val uri = DmfsTaskList.create(testAccount, provider.client, providerName, info)
         assertNotNull(uri)
 
-        return DmfsTaskList.findByID(testAccount, provider.client, providerName, TestTaskList.Factory, ContentUris.parseId(uri))
+        return DmfsTaskList.findByID(testAccount, provider.client, providerName, ContentUris.parseId(uri))
     }
 
 

lib/src/androidTest/kotlin/at/bitfire/ical4android/DmfsTaskTest.kt

@@ -66,7 +66,7 @@ class DmfsTaskTest(
     private val testAccount = Account(javaClass.name, CalendarContract.ACCOUNT_TYPE_LOCAL)
 
     private lateinit var taskListUri: Uri
-    private var taskList: TestTaskList? = null
+    private var taskList: DmfsTaskList? = null
 
     @Before
     override fun prepare() {

lib/src/androidTest/kotlin/at/bitfire/ical4android/impl/TestTaskList.kt

@@ -7,47 +7,26 @@
 package at.bitfire.ical4android.impl
 
 import android.accounts.Account
-import android.content.ContentProviderClient
 import android.content.ContentUris
 import android.content.ContentValues
 import at.bitfire.ical4android.DmfsTaskList
-import at.bitfire.ical4android.DmfsTaskListFactory
 import at.bitfire.ical4android.TaskProvider
 import org.dmfs.tasks.contract.TaskContract
 
-class TestTaskList(
-    account: Account,
-    provider: ContentProviderClient,
-    providerName: TaskProvider.ProviderName,
-    id: Long
-) : DmfsTaskList(account, provider, providerName, id) {
+object TestTaskList {
 
-    companion object {
+    fun create(
+        account: Account,
+        provider: TaskProvider,
+    ): DmfsTaskList {
+        val values = ContentValues(4)
+        values.put(TaskContract.TaskListColumns.LIST_NAME, "Test Task List")
+        values.put(TaskContract.TaskListColumns.LIST_COLOR, 0xffff0000)
+        values.put(TaskContract.TaskListColumns.SYNC_ENABLED, 1)
+        values.put(TaskContract.TaskListColumns.VISIBLE, 1)
+        val uri = DmfsTaskList.create(account, provider.client, provider.name, values)
 
-        fun create(
-            account: Account,
-            provider: TaskProvider,
-        ): TestTaskList {
-            val values = ContentValues(4)
-            values.put(TaskContract.TaskListColumns.LIST_NAME, "Test Task List")
-            values.put(TaskContract.TaskListColumns.LIST_COLOR, 0xffff0000)
-            values.put(TaskContract.TaskListColumns.SYNC_ENABLED, 1)
-            values.put(TaskContract.TaskListColumns.VISIBLE, 1)
-            val uri = create(account, provider.client, provider.name, values)
-
-            return TestTaskList(account, provider.client, provider.name, ContentUris.parseId(uri))
-        }
-
-    }
-
-
-    object Factory : DmfsTaskListFactory<TestTaskList> {
-        override fun newInstance(
-            account: Account,
-            provider: ContentProviderClient,
-            providerName: TaskProvider.ProviderName,
-            id: Long
-        ) = TestTaskList(account, provider, providerName, id)
+        return DmfsTaskList(account, provider.client, provider.name, ContentUris.parseId(uri))
     }
 
 }

lib/src/main/kotlin/at/bitfire/ical4android/DmfsTaskList.kt

@@ -33,7 +33,7 @@ import java.util.logging.Logger
  * Represents a locally stored task list, containing [DmfsTask]s (tasks).
  * Communicates with tasks.org-compatible content providers (currently tasks.org and OpenTasks) to store the tasks.
  */
-open class DmfsTaskList(
+class DmfsTaskList(
     val account: Account,
     val provider: ContentProviderClient,
     val providerName: TaskProvider.ProviderName,
@@ -200,13 +200,12 @@ open class DmfsTaskList(
                 ?: throw LocalStorageException("Couldn't create task list (empty result from provider)")
         }
 
-        fun <T : DmfsTaskList> findByID(
+        fun findByID(
             account: Account,
             provider: ContentProviderClient,
             providerName: TaskProvider.ProviderName,
-            factory: DmfsTaskListFactory<T>,
             id: Long
-        ): T {
+        ): DmfsTaskList {
             provider.query(
                 ContentUris.withAppendedId(TaskLists.getContentUri(providerName.authority), id).asSyncAdapter(account),
                 null,
@@ -215,23 +214,22 @@ open class DmfsTaskList(
                 null
             )?.use { cursor ->
                 if (cursor.moveToNext()) {
-                    val taskList = factory.newInstance(account, provider, providerName, id)
+                    val taskList = DmfsTaskList(account, provider, providerName, id)
                     taskList.populate(cursor.toContentValues())
                     return taskList
                 }
             }
             throw FileNotFoundException()
         }
 
-        fun <T : DmfsTaskList> find(
+        fun find(
             account: Account,
-            factory: DmfsTaskListFactory<T>,
             provider: ContentProviderClient,
             providerName: TaskProvider.ProviderName,
             where: String?,
             whereArgs: Array<String>?
-        ): List<T> {
-            val taskLists = LinkedList<T>()
+        ): List<DmfsTaskList> {
+            val taskLists = LinkedList<DmfsTaskList>()
             provider.query(
                 TaskLists.getContentUri(providerName.authority).asSyncAdapter(account),
                 null,
@@ -241,8 +239,12 @@ open class DmfsTaskList(
             )?.use { cursor ->
                 while (cursor.moveToNext()) {
                     val values = cursor.toContentValues()
-                    val taskList =
-                        factory.newInstance(account, provider, providerName, values.getAsLong(TaskLists._ID))
+                    val taskList = DmfsTaskList(
+                        account = account,
+                        provider = provider,
+                        providerName = providerName,
+                        id = values.getAsLong(TaskLists._ID)
+                    )
                     taskList.populate(values)
                     taskLists += taskList
                 }
@@ -252,14 +254,4 @@ open class DmfsTaskList(
 
     }
 
-    // default factory (will be removed as soon as DmfsTaskList is not open anymore)
-    object Factory : DmfsTaskListFactory<DmfsTaskList> {
-        override fun newInstance(
-            account: Account,
-            provider: ContentProviderClient,
-            providerName: TaskProvider.ProviderName,
-            id: Long
-        ): DmfsTaskList = DmfsTaskList(account, provider, providerName, id)
-    }
-
 }