Reorganized data module

app/src/androidTest/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapterTest.kt

@@ -4,7 +4,7 @@ import com.natpryce.makeiteasy.MakeItEasy.with
 import com.natpryce.makeiteasy.PropertyValue
 import com.todoroo.astrid.api.CaldavFilter
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.service.TaskMover
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
@@ -15,9 +15,9 @@ import org.junit.Before
 import org.junit.Test
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
 import org.tasks.data.TaskContainer
 import org.tasks.data.TaskListQuery.getQuery
 import org.tasks.injection.InjectingTestCase

app/src/androidTest/java/com/todoroo/astrid/adapter/CaldavTaskAdapterTest.kt

@@ -12,6 +12,9 @@ import org.junit.Before
 import org.junit.Test
 import org.tasks.LocalBroadcastManager
 import org.tasks.data.*
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskDao
+import org.tasks.data.entity.CaldavTask
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.TaskContainerMaker.PARENT

app/src/androidTest/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapterTest.kt

@@ -4,7 +4,7 @@ import com.natpryce.makeiteasy.MakeItEasy.with
 import com.natpryce.makeiteasy.PropertyValue
 import com.todoroo.astrid.api.GtasksFilter
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.service.TaskMover
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
@@ -14,8 +14,8 @@ import org.junit.Before
 import org.junit.Test
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
 import org.tasks.data.TaskContainer
 import org.tasks.data.TaskListQuery.getQuery
 import org.tasks.injection.InjectingTestCase

app/src/androidTest/java/com/todoroo/astrid/adapter/OfflineSubtaskTest.kt

@@ -6,7 +6,7 @@ import com.natpryce.makeiteasy.MakeItEasy.with
 import com.natpryce.makeiteasy.PropertyValue
 import com.todoroo.astrid.core.BuiltInFilterExposer
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.service.TaskMover
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
@@ -15,8 +15,8 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
 import org.tasks.data.TaskContainer
 import org.tasks.data.TaskListQuery.getQuery
 import org.tasks.injection.InjectingTestCase

app/src/androidTest/java/com/todoroo/astrid/adapter/RecursiveLoopTest.kt

@@ -4,7 +4,7 @@ import com.natpryce.makeiteasy.MakeItEasy.with
 import com.natpryce.makeiteasy.PropertyValue
 import com.todoroo.astrid.core.BuiltInFilterExposer
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking

app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmJobServiceTest.kt

@@ -7,14 +7,14 @@ import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.tasks.data.Alarm
+import org.tasks.data.entity.Alarm
-import org.tasks.data.Alarm.Companion.TYPE_DATE_TIME
+import org.tasks.data.entity.Alarm.Companion.TYPE_DATE_TIME
-import org.tasks.data.Alarm.Companion.TYPE_RANDOM
+import org.tasks.data.entity.Alarm.Companion.TYPE_RANDOM
-import org.tasks.data.Alarm.Companion.TYPE_SNOOZE
+import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE
-import org.tasks.data.Alarm.Companion.whenDue
+import org.tasks.data.entity.Alarm.Companion.whenDue
-import org.tasks.data.Alarm.Companion.whenOverdue
+import org.tasks.data.entity.Alarm.Companion.whenOverdue
-import org.tasks.data.AlarmDao
+import org.tasks.data.dao.AlarmDao
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
 import org.tasks.date.DateTimeUtils.newDateTime
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule

app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.kt

@@ -5,7 +5,7 @@
  */
 package com.todoroo.astrid.dao
 
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.service.TaskDeleter
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules

app/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.kt

@@ -11,9 +11,9 @@ import org.junit.Assert.assertNull
 import org.junit.Before
 import org.junit.Test
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.GoogleTaskListDao
+import org.tasks.data.dao.GoogleTaskListDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.CaldavCalendarMaker.ID

app/src/androidTest/java/com/todoroo/astrid/model/TaskTest.kt

@@ -1,7 +1,7 @@
 package com.todoroo.astrid.model
 
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking

app/src/androidTest/java/com/todoroo/astrid/repeats/RepeatWithSubtasksTests.kt

@@ -1,6 +1,6 @@
 package com.todoroo.astrid.repeats
 
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.service.TaskCompleter
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
@@ -8,7 +8,7 @@ import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.time.DateTimeUtils2.currentTimeMillis

app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.kt

@@ -5,14 +5,14 @@
  */
 package com.todoroo.astrid.service
 
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.utility.TitleParser
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import java.util.*

app/src/androidTest/java/com/todoroo/astrid/service/TaskCreatorTest.kt

@@ -3,10 +3,10 @@ package com.todoroo.astrid.service
 import com.todoroo.astrid.api.PermaSql.VALUE_EOD
 import com.todoroo.astrid.api.PermaSql.VALUE_EOD_NEXT_WEEK
 import com.todoroo.astrid.api.PermaSql.VALUE_EOD_TOMORROW
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
-import com.todoroo.astrid.data.Task.Companion.DUE_DATE
+import org.tasks.data.entity.Task.Companion.DUE_DATE
-import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL
+import org.tasks.data.entity.Task.Companion.HIDE_UNTIL
-import com.todoroo.astrid.data.Task.Companion.URGENCY_SPECIFIC_DAY
+import org.tasks.data.entity.Task.Companion.URGENCY_SPECIFIC_DAY
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking

app/src/androidTest/java/com/todoroo/astrid/service/TaskDeleterTest.kt

@@ -1,13 +1,13 @@
 package com.todoroo.astrid.service
 
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import javax.inject.Inject

app/src/androidTest/java/com/todoroo/astrid/service/TaskMoverTest.kt

@@ -11,12 +11,12 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavAccount.Companion.TYPE_CALDAV
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_CALDAV
-import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.jobs.WorkManager

app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.kt

@@ -5,7 +5,7 @@
  */
 package com.todoroo.astrid.service
 
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.utility.TitleParser
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
@@ -16,7 +16,7 @@ import org.junit.Before
 import org.junit.Ignore
 import org.junit.Test
 import org.tasks.R
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
 import org.tasks.date.DateTimeUtils
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule

app/src/androidTest/java/com/todoroo/astrid/service/Upgrade_11_3_Test.kt

@@ -3,7 +3,7 @@
 package com.todoroo.astrid.service
 
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
@@ -12,9 +12,9 @@ import org.junit.Test
 import org.tasks.SuspendFreeze.Companion.freezeAt
 import org.tasks.TestUtilities.assertEquals
 import org.tasks.caldav.VtodoCache
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.CaldavCalendarMaker.newCaldavCalendar

app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.kt

@@ -1,13 +1,13 @@
 package com.todoroo.astrid.subtasks
 
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.tasks.data.TaskListMetadata
+import org.tasks.data.entity.TaskListMetadata
 import org.tasks.injection.ProductionModule
 
 @UninstallModules(ProductionModule::class)

app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.kt

@@ -1,12 +1,12 @@
 package com.todoroo.astrid.subtasks
 
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
 import org.junit.Before
 import org.junit.Test
-import org.tasks.data.TaskListMetadata
+import org.tasks.data.entity.TaskListMetadata
 import org.tasks.injection.ProductionModule
 
 @UninstallModules(ProductionModule::class)

app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.kt

@@ -4,10 +4,10 @@ import androidx.test.InstrumentationRegistry
 import com.todoroo.astrid.api.AstridOrderingFilter
 import com.todoroo.astrid.core.BuiltInFilterExposer
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
-import org.tasks.data.TaskListMetadataDao
+import org.tasks.data.dao.TaskListMetadataDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.preferences.Preferences
 import javax.inject.Inject

app/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.kt

@@ -1,9 +1,9 @@
 package com.todoroo.astrid.sync
 
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
-import org.tasks.data.TagData
+import org.tasks.data.entity.TagData
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
 import org.tasks.injection.InjectingTestCase
 import javax.inject.Inject
 

app/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.kt

@@ -1,6 +1,6 @@
 package com.todoroo.astrid.sync
 
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking

app/src/androidTest/java/org/tasks/caldav/CaldavSynchronizerTest.kt

@@ -1,15 +1,15 @@
 package org.tasks.caldav
 
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.helper.UUIDHelper
+import org.tasks.data.UUIDHelper
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.CaldavTaskMaker.CALENDAR
 import org.tasks.makers.CaldavTaskMaker.ETAG
@@ -46,11 +46,13 @@ class CaldavSynchronizerTest : CaldavTest() {
 
     @Test
     fun dontFetchCalendarIfCtagMatches() = runBlocking {
-        caldavDao.insert(CaldavCalendar(
+        caldavDao.insert(
-            account = this@CaldavSynchronizerTest.account.uuid,
+            CaldavCalendar(
-            ctag = "http://sabre.io/ns/sync/1",
+                account = this@CaldavSynchronizerTest.account.uuid,
-            url = "${this@CaldavSynchronizerTest.account.url}test-shared/",
+                ctag = "http://sabre.io/ns/sync/1",
-        ))
+                url = "${this@CaldavSynchronizerTest.account.url}test-shared/",
+            )
+        )
         enqueue(OC_SHARE_PROPFIND)
 
         sync()

app/src/androidTest/java/org/tasks/caldav/CaldavTest.kt

@@ -9,8 +9,8 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.rules.Timeout
 import org.tasks.R
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.preferences.Preferences
 import org.tasks.security.KeyStoreEncryption

app/src/androidTest/java/org/tasks/caldav/ServerDetectionTest.kt

@@ -1,19 +1,19 @@
 package org.tasks.caldav
 
-import com.todoroo.astrid.helper.UUIDHelper
+import org.tasks.data.UUIDHelper
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavAccount.Companion.SERVER_OPEN_XCHANGE
+import org.tasks.data.entity.CaldavAccount.Companion.SERVER_OPEN_XCHANGE
-import org.tasks.data.CaldavAccount.Companion.SERVER_OWNCLOUD
+import org.tasks.data.entity.CaldavAccount.Companion.SERVER_OWNCLOUD
-import org.tasks.data.CaldavAccount.Companion.SERVER_SABREDAV
+import org.tasks.data.entity.CaldavAccount.Companion.SERVER_SABREDAV
-import org.tasks.data.CaldavAccount.Companion.SERVER_TASKS
+import org.tasks.data.entity.CaldavAccount.Companion.SERVER_TASKS
-import org.tasks.data.CaldavAccount.Companion.SERVER_UNKNOWN
+import org.tasks.data.entity.CaldavAccount.Companion.SERVER_UNKNOWN
-import org.tasks.data.CaldavAccount.Companion.TYPE_CALDAV
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_CALDAV
-import org.tasks.data.CaldavAccount.Companion.TYPE_TASKS
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_TASKS
 import org.tasks.injection.ProductionModule
 
 @UninstallModules(ProductionModule::class)

app/src/androidTest/java/org/tasks/caldav/SharingMailboxDotOrgTest.kt

@@ -1,16 +1,16 @@
 package org.tasks.caldav
 
-import com.todoroo.astrid.helper.UUIDHelper
+import org.tasks.data.UUIDHelper
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_WRITE
+import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_WRITE
-import org.tasks.data.PrincipalDao
+import org.tasks.data.dao.PrincipalDao
 import org.tasks.injection.ProductionModule
 import javax.inject.Inject
 

app/src/androidTest/java/org/tasks/caldav/SharingOwncloudTest.kt

@@ -1,16 +1,16 @@
 package org.tasks.caldav
 
-import com.todoroo.astrid.helper.UUIDHelper
+import org.tasks.data.UUIDHelper
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.*
 import org.junit.Test
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavCalendar.Companion.ACCESS_OWNER
+import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_OWNER
-import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_ONLY
+import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_ONLY
-import org.tasks.data.PrincipalDao
+import org.tasks.data.dao.PrincipalDao
 import org.tasks.injection.ProductionModule
 import javax.inject.Inject
 

app/src/androidTest/java/org/tasks/caldav/SharingSabredavTest.kt

@@ -1,18 +1,18 @@
 package org.tasks.caldav
 
-import com.todoroo.astrid.helper.UUIDHelper
+import org.tasks.data.UUIDHelper
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavCalendar.Companion.ACCESS_OWNER
+import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_OWNER
-import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_WRITE
+import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_WRITE
-import org.tasks.data.CaldavCalendar.Companion.INVITE_ACCEPTED
+import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_ACCEPTED
-import org.tasks.data.PrincipalDao
+import org.tasks.data.dao.PrincipalDao
 import org.tasks.injection.ProductionModule
 import javax.inject.Inject
 

app/src/androidTest/java/org/tasks/data/CaldavDaoShiftTests.kt

@@ -9,6 +9,9 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
 import org.tasks.SuspendFreeze.Companion.freezeAt
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.TaskDao
+import org.tasks.data.entity.CaldavTask
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.TaskContainerMaker

app/src/androidTest/java/org/tasks/data/CaldavDaoTests.kt

@@ -2,7 +2,6 @@ package org.tasks.data
 
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.helper.UUIDHelper
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
@@ -10,6 +9,11 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.TagDao
+import org.tasks.data.dao.TagDataDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavTask
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.TaskMaker.CREATION_TIME

app/src/androidTest/java/org/tasks/data/DeletionDaoTests.kt

@@ -2,7 +2,6 @@ package org.tasks.data
 
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.helper.UUIDHelper
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
@@ -10,7 +9,11 @@ import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.tasks.data.CaldavDao.Companion.LOCAL
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.CaldavDao.Companion.LOCAL
+import org.tasks.data.dao.DeletionDao
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.CaldavTask
 import org.tasks.date.DateTimeUtils.newDateTime
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule

app/src/androidTest/java/org/tasks/data/GoogleTaskDaoTests.kt

@@ -9,7 +9,12 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Before
 import org.junit.Test
-import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskListDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavTask
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.CaldavCalendarMaker.newCaldavCalendar

app/src/androidTest/java/org/tasks/data/GoogleTaskListDaoTest.kt

@@ -5,6 +5,9 @@ import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskListDao
+import org.tasks.data.entity.CaldavAccount
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import javax.inject.Inject

app/src/androidTest/java/org/tasks/data/LocationDaoTest.kt

@@ -2,7 +2,7 @@ package org.tasks.data
 
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
@@ -10,7 +10,12 @@ import org.junit.Assert.*
 import org.junit.Test
 import org.tasks.SuspendFreeze.Companion.freezeAt
 import org.tasks.caldav.GeoUtils.toLikeString
-import org.tasks.data.Alarm.Companion.TYPE_SNOOZE
+import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE
+import org.tasks.data.dao.AlarmDao
+import org.tasks.data.dao.LocationDao
+import org.tasks.data.entity.Alarm
+import org.tasks.data.entity.Geofence
+import org.tasks.data.entity.Place
 import org.tasks.date.DateTimeUtils.newDateTime
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule

app/src/androidTest/java/org/tasks/data/ManualGoogleTaskQueryTest.kt

@@ -3,7 +3,6 @@ package org.tasks.data
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.todoroo.astrid.api.GtasksFilter
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.helper.UUIDHelper
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
@@ -11,6 +10,9 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.tasks.R
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskDao
+import org.tasks.data.entity.CaldavAccount
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.CaldavCalendarMaker.UUID

app/src/androidTest/java/org/tasks/data/TagDataDaoTest.kt

@@ -8,6 +8,8 @@ import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import org.tasks.data.dao.TagDao
+import org.tasks.data.dao.TagDataDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.TagDataMaker.NAME

app/src/androidTest/java/org/tasks/data/TaskDaoTests.kt

@@ -6,7 +6,7 @@
 package org.tasks.data
 
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.service.TaskDeleter
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
@@ -14,6 +14,7 @@ import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
+import org.tasks.data.dao.TaskDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.TaskMaker.PARENT

app/src/androidTest/java/org/tasks/data/UpgraderDaoTests.kt

@@ -8,6 +8,11 @@ import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.TagDao
+import org.tasks.data.dao.TagDataDao
+import org.tasks.data.dao.UpgraderDao
+import org.tasks.data.entity.CaldavTask
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.TagDataMaker

app/src/androidTest/java/org/tasks/gtasks/GoogleTaskSynchronizerTest.kt

@@ -2,7 +2,7 @@ package org.tasks.gtasks
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test

app/src/androidTest/java/org/tasks/injection/TestModule.kt

@@ -2,7 +2,7 @@ package org.tasks.injection
 
 import android.content.Context
 import androidx.room.Room
-import com.todoroo.astrid.dao.Database
+import org.tasks.data.db.Database
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.kt

@@ -8,7 +8,7 @@ package org.tasks.jobs
 import android.net.Uri
 import androidx.test.InstrumentationRegistry
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking

app/src/androidTest/java/org/tasks/opentasks/OpenTasksDueDateTests.kt

@@ -1,7 +1,7 @@
 package org.tasks.opentasks
 
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking

app/src/androidTest/java/org/tasks/opentasks/OpenTasksPropertiesTests.kt

@@ -1,7 +1,7 @@
 package org.tasks.opentasks
 
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
@@ -13,11 +13,11 @@ import org.tasks.caldav.iCalendar.Companion.collapsed
 import org.tasks.caldav.iCalendar.Companion.order
 import org.tasks.caldav.iCalendar.Companion.parent
 import org.tasks.caldav.iCalendar.Companion.snooze
-import org.tasks.data.Alarm
+import org.tasks.data.entity.Alarm
-import org.tasks.data.Alarm.Companion.TYPE_SNOOZE
+import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE
-import org.tasks.data.AlarmDao
+import org.tasks.data.dao.AlarmDao
-import org.tasks.data.TagDao
+import org.tasks.data.dao.TagDao
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.CaldavTaskMaker
 import org.tasks.makers.CaldavTaskMaker.CALENDAR

app/src/androidTest/java/org/tasks/opentasks/OpenTasksSynchronizerTest.kt

@@ -8,9 +8,9 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavAccount.Companion.TYPE_OPENTASKS
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_OPENTASKS
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.CaldavTaskMaker.CALENDAR
 import org.tasks.makers.CaldavTaskMaker.REMOTE_ID

app/src/androidTest/java/org/tasks/opentasks/OpenTasksTest.kt

@@ -3,8 +3,8 @@ package org.tasks.opentasks
 import com.todoroo.astrid.dao.TaskDao
 import org.junit.Before
 import org.tasks.R
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.preferences.Preferences
 import javax.inject.Inject

app/src/androidTest/java/org/tasks/opentasks/TestOpenTaskDao.kt

@@ -4,13 +4,13 @@ import android.content.ContentProviderResult
 import android.content.Context
 import at.bitfire.ical4android.BatchOperation
 import at.bitfire.ical4android.Task
-import com.todoroo.astrid.helper.UUIDHelper
+import org.tasks.data.UUIDHelper
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.dmfs.tasks.contract.TaskContract
 import org.dmfs.tasks.contract.TaskContract.TaskListColumns.ACCESS_LEVEL_OWNER
 import org.tasks.caldav.iCalendar
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
 import org.tasks.data.MyAndroidTask
 import org.tasks.data.OpenTaskDao
 import javax.inject.Inject

app/src/androidTest/java/org/tasks/preferences/PreferenceTests.kt

@@ -3,9 +3,9 @@ package org.tasks.preferences
 import android.annotation.SuppressLint
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.todoroo.astrid.data.Task.Companion.NOTIFY_AFTER_DEADLINE
+import org.tasks.data.entity.Task.Companion.NOTIFY_AFTER_DEADLINE
-import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_DEADLINE
+import org.tasks.data.entity.Task.Companion.NOTIFY_AT_DEADLINE
-import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_START
+import org.tasks.data.entity.Task.Companion.NOTIFY_AT_START
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test

app/src/androidTest/java/org/tasks/ui/editviewmodel/BaseTaskEditViewModelTest.kt

@@ -3,9 +3,9 @@ package org.tasks.ui.editviewmodel
 import androidx.lifecycle.SavedStateHandle
 import com.todoroo.astrid.activity.TaskEditFragment
 import com.todoroo.astrid.alarms.AlarmService
-import com.todoroo.astrid.dao.Database
+import org.tasks.data.db.Database
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.gcal.GCalHelper
 import com.todoroo.astrid.service.TaskCompleter
 import com.todoroo.astrid.service.TaskDeleter
@@ -15,10 +15,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.runBlocking
 import org.tasks.calendars.CalendarEventProvider
-import org.tasks.data.AlarmDao
+import org.tasks.data.dao.AlarmDao
-import org.tasks.data.LocationDao
+import org.tasks.data.dao.LocationDao
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
-import org.tasks.data.UserActivityDao
+import org.tasks.data.dao.UserActivityDao
 import org.tasks.data.getLocation
 import org.tasks.injection.InjectingTestCase
 import org.tasks.location.GeofenceApi

app/src/androidTest/java/org/tasks/ui/editviewmodel/PriorityTests.kt

@@ -1,7 +1,7 @@
 package org.tasks.ui.editviewmodel
 
 import com.natpryce.makeiteasy.MakeItEasy
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import org.junit.Assert

app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt

@@ -1,6 +1,6 @@
 package org.tasks.ui.editviewmodel
 
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
@@ -8,8 +8,8 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.tasks.data.Alarm
+import org.tasks.data.entity.Alarm
-import org.tasks.data.Alarm.Companion.whenOverdue
+import org.tasks.data.entity.Alarm.Companion.whenOverdue
 import org.tasks.data.createDueDate
 import org.tasks.injection.ProductionModule
 import org.tasks.makers.TaskMaker.newTask

app/src/androidTest/java/org/tasks/ui/editviewmodel/TaskEditViewModelTest.kt

@@ -1,6 +1,6 @@
 package org.tasks.ui.editviewmodel
 
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking

app/src/androidTest/java/org/tasks/ui/editviewmodel/TaskListViewModelTest.kt

@@ -1,7 +1,7 @@
 package org.tasks.ui.editviewmodel
 
 import com.todoroo.astrid.core.BuiltInFilterExposer
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.service.TaskDeleter
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
@@ -13,8 +13,8 @@ import org.junit.Test
 import org.tasks.LocalBroadcastManager
 import org.tasks.analytics.Firebase
 import org.tasks.billing.Inventory
-import org.tasks.data.DeletionDao
+import org.tasks.data.dao.DeletionDao
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.preferences.Preferences

app/src/androidTest/java/org/tasks/ui/editviewmodel/TitleTests.kt

@@ -1,7 +1,7 @@
 package org.tasks.ui.editviewmodel
 
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.data.Task.Priority.Companion.HIGH
+import org.tasks.data.entity.Task.Priority.Companion.HIGH
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking

app/src/androidTestGoogleplay/java/org/tasks/billing/InventoryTest.kt

@@ -7,7 +7,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
 import org.tasks.injection.InjectingTestCase
 import org.tasks.injection.ProductionModule
 import org.tasks.preferences.Preferences

app/src/androidTestGoogleplay/java/org/tasks/caldav/CaldavSubscriptionTest.kt

@@ -1,7 +1,7 @@
 package org.tasks.caldav
 
 import androidx.test.annotation.UiThreadTest
-import com.todoroo.astrid.helper.UUIDHelper
+import org.tasks.data.UUIDHelper
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
 import kotlinx.coroutines.runBlocking
@@ -9,7 +9,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.tasks.R
 import org.tasks.billing.Inventory
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
 import org.tasks.injection.ProductionModule
 import javax.inject.Inject
 

app/src/debug/java/org/tasks/FlipperHttpInterceptor.kt

@@ -5,7 +5,7 @@ import com.facebook.flipper.plugins.network.NetworkReporter
 import com.facebook.flipper.plugins.network.NetworkReporter.ResponseInfo
 import com.google.api.client.http.*
 import com.google.api.client.json.GenericJson
-import com.todoroo.astrid.helper.UUIDHelper
+import org.tasks.data.UUIDHelper
 import org.tasks.time.DateTimeUtils2.currentTimeMillis
 import timber.log.Timber
 import java.io.ByteArrayOutputStream

app/src/googleplay/java/org/tasks/location/GoogleGeofenceTransitionIntentService.kt

@@ -7,7 +7,7 @@ import com.google.android.gms.location.Geofence
 import com.google.android.gms.location.GeofencingEvent
 import dagger.hilt.android.AndroidEntryPoint
 import org.tasks.Notifier
-import org.tasks.data.LocationDao
+import org.tasks.data.dao.LocationDao
 import org.tasks.injection.InjectingJobIntentService
 import org.tasks.time.DateTimeUtils2.currentTimeMillis
 import timber.log.Timber

app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt

@@ -10,7 +10,7 @@ import com.google.android.gms.maps.SupportMapFragment
 import com.google.android.gms.maps.model.*
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.tasks.R
-import org.tasks.data.Place
+import org.tasks.data.entity.Place
 import org.tasks.location.MapFragment.MapFragmentCallback
 import javax.inject.Inject
 

app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt

@@ -12,7 +12,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.tasks.data.MergedGeofence
-import org.tasks.data.Place
+import org.tasks.data.entity.Place
 import javax.inject.Inject
 import kotlin.coroutines.suspendCoroutine
 

app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java

@@ -13,7 +13,7 @@ import android.text.format.DateFormat;
 
 import androidx.annotation.Nullable;
 
-import com.todoroo.astrid.data.Task;
+import org.tasks.data.entity.Task;
 
 import org.tasks.BuildConfig;
 import org.tasks.R;

app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt

@@ -43,11 +43,11 @@ import org.tasks.analytics.Firebase
 import org.tasks.billing.Inventory
 import org.tasks.compose.collectAsStateLifecycleAware
 import org.tasks.compose.drawer.TasksMenu
-import org.tasks.data.AlarmDao
+import org.tasks.data.dao.AlarmDao
-import org.tasks.data.LocationDao
+import org.tasks.data.dao.LocationDao
-import org.tasks.data.Place
+import org.tasks.data.entity.Place
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import org.tasks.data.getLocation
 import org.tasks.databinding.TaskListActivityBinding
 import org.tasks.dialogs.NewFilterDialog

app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt

@@ -28,10 +28,10 @@ import org.tasks.R
 import org.tasks.Tasks.Companion.IS_GENERIC
 import org.tasks.billing.Inventory
 import org.tasks.compose.drawer.DrawerItem
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
 import org.tasks.data.NO_COUNT
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
 import org.tasks.data.count
 import org.tasks.filters.FilterProvider
 import org.tasks.filters.NavigationDrawerSubheader

app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.kt

@@ -6,13 +6,13 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.service.TaskCreator
 import com.todoroo.astrid.utility.Constants
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import org.tasks.analytics.Firebase
-import org.tasks.data.TaskAttachment
+import org.tasks.data.entity.TaskAttachment
 import org.tasks.files.FileHelper
 import org.tasks.intents.TaskIntents
 import org.tasks.preferences.Preferences

app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt

@@ -47,7 +47,7 @@ import com.todoroo.andlib.utility.AndroidUtilities.atLeastOreoMR1
 import com.todoroo.andlib.utility.DateUtilities
 import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.files.FilesControlSet
 import com.todoroo.astrid.repeats.RepeatControlSet
 import com.todoroo.astrid.tags.TagsControlSet
@@ -71,10 +71,10 @@ import org.tasks.compose.edit.DueDateRow
 import org.tasks.compose.edit.InfoRow
 import org.tasks.compose.edit.ListRow
 import org.tasks.compose.edit.PriorityRow
-import org.tasks.data.Alarm
+import org.tasks.data.entity.Alarm
 import org.tasks.data.Location
-import org.tasks.data.TagData
+import org.tasks.data.entity.TagData
-import org.tasks.data.UserActivityDao
+import org.tasks.data.dao.UserActivityDao
 import org.tasks.databinding.FragmentTaskEditBinding
 import org.tasks.databinding.TaskEditCalendarBinding
 import org.tasks.databinding.TaskEditFilesBinding

app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt

@@ -50,8 +50,8 @@ import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.bottomappbar.BottomAppBar
 import com.google.android.material.composethemeadapter.MdcTheme
 import com.google.android.material.snackbar.Snackbar
-import com.todoroo.andlib.sql.Join
+import org.tasks.data.sql.Join
-import com.todoroo.andlib.sql.QueryTemplate
+import org.tasks.data.sql.QueryTemplate
 import com.todoroo.andlib.utility.DateUtilities
 import com.todoroo.astrid.adapter.TaskAdapter
 import com.todoroo.astrid.adapter.TaskAdapterProvider
@@ -93,15 +93,15 @@ import org.tasks.billing.PurchaseActivity
 import org.tasks.caldav.BaseCaldavCalendarSettingsActivity
 import org.tasks.compose.SubscriptionNagBanner
 import org.tasks.compose.collectAsStateLifecycleAware
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import com.todoroo.astrid.dao.Database
+import org.tasks.data.db.Database
-import org.tasks.data.Tag
+import org.tasks.data.entity.Tag
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import org.tasks.data.TaskContainer
 import org.tasks.data.listSettingsClass
 import org.tasks.databinding.FragmentTaskListBinding
-import org.tasks.db.SuspendDbUtils.chunkedMap
+import org.tasks.data.db.SuspendDbUtils.chunkedMap
 import org.tasks.dialogs.DateTimePicker.Companion.newDateTimePicker
 import org.tasks.dialogs.DialogBuilder
 import org.tasks.dialogs.FilterPicker.Companion.newFilterPicker

app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.kt

@@ -2,15 +2,15 @@ package com.todoroo.astrid.adapter
 
 import com.todoroo.astrid.api.AstridOrderingFilter
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.service.TaskMover
 import com.todoroo.astrid.subtasks.SubtasksFilterUpdater
 import org.tasks.LocalBroadcastManager
 import org.tasks.Strings.isNullOrEmpty
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
 import org.tasks.data.TaskContainer
-import org.tasks.data.TaskListMetadata
+import org.tasks.data.entity.TaskListMetadata
 import org.tasks.time.DateTimeUtils2.currentTimeMillis
 import timber.log.Timber
 import java.util.Collections

app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt

@@ -3,15 +3,15 @@ package com.todoroo.astrid.adapter
 import com.todoroo.astrid.dao.TaskDao
 import com.todoroo.astrid.service.TaskMover
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
 
 class CaldavManualSortTaskAdapter internal constructor(
-        googleTaskDao: GoogleTaskDao,
+    googleTaskDao: GoogleTaskDao,
-        caldavDao: CaldavDao,
+    caldavDao: CaldavDao,
-        taskDao: TaskDao,
+    taskDao: TaskDao,
-        localBroadcastManager: LocalBroadcastManager,
+    localBroadcastManager: LocalBroadcastManager,
-        taskMover: TaskMover,
+    taskMover: TaskMover,
 ) : TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager, taskMover) {
 
     override suspend fun moved(from: Int, to: Int, indent: Int) {

app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapter.kt

@@ -3,15 +3,15 @@ package com.todoroo.astrid.adapter
 import com.todoroo.astrid.dao.TaskDao
 import com.todoroo.astrid.service.TaskMover
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
 
 class GoogleTaskManualSortAdapter internal constructor(
-        googleTaskDao: GoogleTaskDao,
+    googleTaskDao: GoogleTaskDao,
-        caldavDao: CaldavDao,
+    caldavDao: CaldavDao,
-        taskDao: TaskDao,
+    taskDao: TaskDao,
-        localBroadcastManager: LocalBroadcastManager,
+    localBroadcastManager: LocalBroadcastManager,
-        taskMover: TaskMover,
+    taskMover: TaskMover,
 ) : TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager, taskMover) {
 
     override suspend fun moved(from: Int, to: Int, indent: Int) {

app/src/main/java/com/todoroo/astrid/adapter/SubheaderClickHandler.kt

@@ -6,7 +6,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
 import org.tasks.dialogs.NewFilterDialog
 import org.tasks.filters.FilterProvider
 import org.tasks.filters.NavigationDrawerSubheader

app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt

@@ -14,12 +14,12 @@ import com.todoroo.astrid.dao.TaskDao
 import com.todoroo.astrid.service.TaskMover
 import org.tasks.BuildConfig
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.CaldavDao.Companion.toAppleEpoch
+import org.tasks.data.dao.CaldavDao.Companion.toAppleEpoch
-import org.tasks.data.CaldavTask
+import org.tasks.data.entity.CaldavTask
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
-import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL_SPECIFIC_DAY
+import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_SPECIFIC_DAY
 import org.tasks.data.TaskContainer
 import org.tasks.data.createDueDate
 import org.tasks.data.createHideUntil
@@ -27,12 +27,12 @@ import org.tasks.date.DateTimeUtils.toDateTime
 import org.tasks.time.DateTimeUtils.millisOfDay
 
 open class TaskAdapter(
-        private val newTasksOnTop: Boolean,
+    private val newTasksOnTop: Boolean,
-        private val googleTaskDao: GoogleTaskDao,
+    private val googleTaskDao: GoogleTaskDao,
-        private val caldavDao: CaldavDao,
+    private val caldavDao: CaldavDao,
-        private val taskDao: TaskDao,
+    private val taskDao: TaskDao,
-        private val localBroadcastManager: LocalBroadcastManager,
+    private val localBroadcastManager: LocalBroadcastManager,
-        private val taskMover: TaskMover,
+    private val taskMover: TaskMover,
 ) {
     private val selected = HashSet<Long>()
     private lateinit var dataSource: TaskAdapterDataSource

app/src/main/java/com/todoroo/astrid/adapter/TaskAdapterProvider.kt

@@ -8,7 +8,7 @@ import com.todoroo.astrid.api.GtasksFilter
 import com.todoroo.astrid.api.TagFilter
 import com.todoroo.astrid.core.BuiltInFilterExposer
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task.Companion.isUuidEmpty
+import org.tasks.data.entity.Task.Companion.isUuidEmpty
 import com.todoroo.astrid.service.TaskMover
 import com.todoroo.astrid.subtasks.SubtasksFilterUpdater
 import com.todoroo.astrid.subtasks.SubtasksHelper
@@ -16,22 +16,22 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.runBlocking
 import org.tasks.LocalBroadcastManager
 import org.tasks.Strings.isNullOrEmpty
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
-import org.tasks.data.TaskListMetadata
+import org.tasks.data.entity.TaskListMetadata
-import org.tasks.data.TaskListMetadataDao
+import org.tasks.data.dao.TaskListMetadataDao
 import org.tasks.preferences.Preferences
 import javax.inject.Inject
 
 class TaskAdapterProvider @Inject constructor(
-        @param:ApplicationContext private val context: Context,
+    @param:ApplicationContext private val context: Context,
-        private val preferences: Preferences,
+    private val preferences: Preferences,
-        private val taskListMetadataDao: TaskListMetadataDao,
+    private val taskListMetadataDao: TaskListMetadataDao,
-        private val taskDao: TaskDao,
+    private val taskDao: TaskDao,
-        private val googleTaskDao: GoogleTaskDao,
+    private val googleTaskDao: GoogleTaskDao,
-        private val caldavDao: CaldavDao,
+    private val caldavDao: CaldavDao,
-        private val localBroadcastManager: LocalBroadcastManager,
+    private val localBroadcastManager: LocalBroadcastManager,
-        private val taskMover: TaskMover,
+    private val taskMover: TaskMover,
 ) {
     fun createTaskAdapter(filter: Filter): TaskAdapter {
         if (filter is AstridOrderingFilter && preferences.isAstridSort) {

app/src/main/java/com/todoroo/astrid/alarms/AlarmCalculator.kt

@@ -1,7 +1,7 @@
 package com.todoroo.astrid.alarms
 
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
-import org.tasks.data.Alarm
+import org.tasks.data.entity.Alarm
 import org.tasks.jobs.AlarmEntry
 import org.tasks.preferences.Preferences
 import org.tasks.reminders.Random

app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt

@@ -6,10 +6,10 @@
 package com.todoroo.astrid.alarms
 
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.Alarm
+import org.tasks.data.entity.Alarm
-import org.tasks.data.Alarm.Companion.TYPE_SNOOZE
+import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE
-import org.tasks.data.AlarmDao
+import org.tasks.data.dao.AlarmDao
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
 import org.tasks.jobs.AlarmEntry
 import org.tasks.jobs.WorkManager
 import org.tasks.notifications.NotificationManager

app/src/main/java/com/todoroo/astrid/api/CaldavFilter.kt

@@ -1,15 +1,15 @@
 package com.todoroo.astrid.api
 
-import com.todoroo.andlib.sql.Criterion.Companion.and
+import org.tasks.data.sql.Criterion.Companion.and
-import com.todoroo.andlib.sql.Join.Companion.left
+import org.tasks.data.sql.Join.Companion.left
-import com.todoroo.andlib.sql.QueryTemplate
+import org.tasks.data.sql.QueryTemplate
 import com.todoroo.andlib.utility.AndroidUtilities
 import kotlinx.parcelize.Parcelize
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavTask
+import org.tasks.data.entity.CaldavTask
 import org.tasks.data.NO_COUNT
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
-import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible
+import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible
 
 @Parcelize
 data class CaldavFilter(

app/src/main/java/com/todoroo/astrid/api/CustomFilter.kt

@@ -5,7 +5,7 @@ import org.tasks.themes.CustomIcons
 
 @Parcelize
 data class CustomFilter(
-    val filter: org.tasks.data.Filter,
+    val filter: org.tasks.data.entity.Filter,
 ) : Filter {
     override val title: String?
         get() = filter.title

app/src/main/java/com/todoroo/astrid/api/GtasksFilter.kt

@@ -1,16 +1,16 @@
 package com.todoroo.astrid.api
 
-import com.todoroo.andlib.sql.Criterion.Companion.and
+import org.tasks.data.sql.Criterion.Companion.and
-import com.todoroo.andlib.sql.Join.Companion.left
+import org.tasks.data.sql.Join.Companion.left
-import com.todoroo.andlib.sql.QueryTemplate
+import org.tasks.data.sql.QueryTemplate
 import com.todoroo.andlib.utility.AndroidUtilities
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import kotlinx.parcelize.Parcelize
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavTask
+import org.tasks.data.entity.CaldavTask
 import org.tasks.data.GoogleTask
 import org.tasks.data.NO_COUNT
-import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible
+import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible
 
 @Parcelize
 data class GtasksFilter(

app/src/main/java/com/todoroo/astrid/api/SearchFilter.kt

@@ -1,17 +1,17 @@
 package com.todoroo.astrid.api
 
-import com.todoroo.andlib.sql.Criterion
+import org.tasks.data.sql.Criterion
-import com.todoroo.andlib.sql.Join
+import org.tasks.data.sql.Join
-import com.todoroo.andlib.sql.Query
+import org.tasks.data.sql.Query
-import com.todoroo.andlib.sql.QueryTemplate
+import org.tasks.data.sql.QueryTemplate
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import kotlinx.parcelize.Parcelize
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavTask
+import org.tasks.data.entity.CaldavTask
-import org.tasks.data.Geofence
+import org.tasks.data.entity.Geofence
-import org.tasks.data.Place
+import org.tasks.data.entity.Place
-import org.tasks.data.Tag
+import org.tasks.data.entity.Tag
-import org.tasks.data.UserActivity
+import org.tasks.data.entity.UserActivity
 
 @Parcelize
 data class SearchFilter(

app/src/main/java/com/todoroo/astrid/api/TagFilter.kt

@@ -1,15 +1,15 @@
 package com.todoroo.astrid.api
 
-import com.todoroo.andlib.sql.Criterion.Companion.and
+import org.tasks.data.sql.Criterion.Companion.and
-import com.todoroo.andlib.sql.Join.Companion.inner
+import org.tasks.data.sql.Join.Companion.inner
-import com.todoroo.andlib.sql.QueryTemplate
+import org.tasks.data.sql.QueryTemplate
 import com.todoroo.andlib.utility.AndroidUtilities
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import kotlinx.parcelize.Parcelize
 import org.tasks.data.NO_COUNT
-import org.tasks.data.Tag
+import org.tasks.data.entity.Tag
-import org.tasks.data.TagData
+import org.tasks.data.entity.TagData
-import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible
+import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible
 
 @Parcelize
 data class TagFilter(

app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.kt

@@ -7,19 +7,19 @@ package com.todoroo.astrid.core
 
 import android.content.Context
 import android.content.res.Resources
-import com.todoroo.andlib.sql.Criterion.Companion.and
+import org.tasks.data.sql.Criterion.Companion.and
-import com.todoroo.andlib.sql.Criterion.Companion.or
+import org.tasks.data.sql.Criterion.Companion.or
-import com.todoroo.andlib.sql.Join
+import org.tasks.data.sql.Join
-import com.todoroo.andlib.sql.QueryTemplate
+import org.tasks.data.sql.QueryTemplate
 import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.api.FilterImpl
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.tasks.R
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.CaldavTask
+import org.tasks.data.entity.CaldavTask
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
 import org.tasks.filters.MyTasksFilter
 import org.tasks.filters.NotificationsFilter
 import org.tasks.filters.RecentlyModifiedFilter

app/src/main/java/com/todoroo/astrid/core/CriterionInstance.kt

@@ -5,7 +5,7 @@ import com.todoroo.astrid.api.BooleanCriterion
 import com.todoroo.astrid.api.CustomFilterCriterion
 import com.todoroo.astrid.api.MultipleSelectCriterion
 import com.todoroo.astrid.api.TextInputCriterion
-import com.todoroo.astrid.helper.UUIDHelper
+import org.tasks.data.UUIDHelper
 
 class CriterionInstance {
     lateinit var criterion: CustomFilterCriterion

app/src/main/java/com/todoroo/astrid/core/SortHelper.java

@@ -6,7 +6,7 @@
 
 package com.todoroo.astrid.core;
 
-import static org.tasks.data.CaldavDaoKt.APPLE_EPOCH;
+import static org.tasks.data.dao.CaldavDaoKt.APPLE_EPOCH;
 import static org.tasks.db.QueryUtils.showCompleted;
 import static org.tasks.db.QueryUtils.showHidden;
 
@@ -14,12 +14,12 @@ import android.annotation.SuppressLint;
 
 import androidx.annotation.Nullable;
 
-import com.todoroo.andlib.sql.Functions;
+import org.tasks.data.sql.Functions;
-import com.todoroo.andlib.sql.Order;
+import org.tasks.data.sql.Order;
-import com.todoroo.andlib.sql.OrderType;
+import org.tasks.data.sql.OrderType;
-import com.todoroo.astrid.data.Task;
+import org.tasks.data.entity.Task;
 
-import org.tasks.data.CaldavCalendar;
+import org.tasks.data.entity.CaldavCalendar;
 import org.tasks.preferences.QueryPreferences;
 
 import java.util.Locale;

app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt

@@ -8,14 +8,14 @@ package com.todoroo.astrid.dao
 import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.timers.TimerPlugin
 import org.tasks.LocalBroadcastManager
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import org.tasks.data.TaskContainer
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
 import org.tasks.data.fetchFiltered
 import org.tasks.data.fetchTasks
 import org.tasks.data.setCollapsed
 import org.tasks.date.DateTimeUtils.isAfterNow
-import org.tasks.db.SuspendDbUtils.eachChunk
+import org.tasks.data.db.SuspendDbUtils.eachChunk
 import org.tasks.jobs.WorkManager
 import org.tasks.location.GeofenceApi
 import org.tasks.notifications.NotificationManager
@@ -24,13 +24,13 @@ import org.tasks.sync.SyncAdapters
 import javax.inject.Inject
 
 class TaskDao @Inject constructor(
-        private val taskDao: TaskDao,
+    private val taskDao: TaskDao,
-        private val localBroadcastManager: LocalBroadcastManager,
+    private val localBroadcastManager: LocalBroadcastManager,
-        private val notificationManager: NotificationManager,
+    private val notificationManager: NotificationManager,
-        private val geofenceApi: GeofenceApi,
+    private val geofenceApi: GeofenceApi,
-        private val timerPlugin: TimerPlugin,
+    private val timerPlugin: TimerPlugin,
-        private val syncAdapters: SyncAdapters,
+    private val syncAdapters: SyncAdapters,
-        private val workManager: WorkManager,
+    private val workManager: WorkManager,
 ) {
 
     suspend fun fetch(id: Long): Task? = taskDao.fetch(id)

app/src/main/java/com/todoroo/astrid/files/FilesControlSet.kt

@@ -21,8 +21,8 @@ import org.tasks.R
 import org.tasks.Strings
 import org.tasks.compose.collectAsStateLifecycleAware
 import org.tasks.compose.edit.AttachmentRow
-import org.tasks.data.TaskAttachment
+import org.tasks.data.entity.TaskAttachment
-import org.tasks.data.TaskAttachmentDao
+import org.tasks.data.dao.TaskAttachmentDao
 import org.tasks.dialogs.AddAttachmentDialog
 import org.tasks.files.FileHelper
 import org.tasks.preferences.Preferences

app/src/main/java/com/todoroo/astrid/gcal/GCalHelper.kt

@@ -12,12 +12,12 @@ import android.net.Uri
 import android.provider.CalendarContract
 import android.text.format.Time
 import com.todoroo.andlib.utility.DateUtilities
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.tasks.R
 import org.tasks.Strings.isNullOrEmpty
 import org.tasks.calendars.CalendarEventProvider
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
 import org.tasks.preferences.PermissionChecker
 import org.tasks.preferences.Preferences
 import org.tasks.time.DateTimeUtils2.currentTimeMillis
@@ -26,11 +26,11 @@ import java.util.TimeZone
 import javax.inject.Inject
 
 class GCalHelper @Inject constructor(
-        @ApplicationContext private val context: Context,
+    @ApplicationContext private val context: Context,
-        private val taskDao: TaskDao,
+    private val taskDao: TaskDao,
-        private val preferences: Preferences,
+    private val preferences: Preferences,
-        private val permissionChecker: PermissionChecker,
+    private val permissionChecker: PermissionChecker,
-        private val calendarEventProvider: CalendarEventProvider) {
+    private val calendarEventProvider: CalendarEventProvider) {
 
     private val cr: ContentResolver = context.contentResolver
 

app/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.kt

@@ -8,15 +8,15 @@ package com.todoroo.astrid.gtasks
 import com.google.api.services.tasks.model.TaskList
 import com.todoroo.astrid.service.TaskDeleter
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.GoogleTaskListDao
+import org.tasks.data.dao.GoogleTaskListDao
 import javax.inject.Inject
 
 class GtasksListService @Inject constructor(
-        private val googleTaskListDao: GoogleTaskListDao,
+    private val googleTaskListDao: GoogleTaskListDao,
-        private val taskDeleter: TaskDeleter,
+    private val taskDeleter: TaskDeleter,
-        private val localBroadcastManager: LocalBroadcastManager,
+    private val localBroadcastManager: LocalBroadcastManager,
 ) {
 
     /**

app/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.kt

@@ -21,10 +21,10 @@ import org.tasks.PermissionUtil.verifyPermissions
 import org.tasks.R
 import org.tasks.analytics.Constants
 import org.tasks.analytics.Firebase
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.GoogleTaskListDao
+import org.tasks.data.dao.GoogleTaskListDao
 import org.tasks.dialogs.DialogBuilder
 import org.tasks.gtasks.GoogleAccountManager
 import org.tasks.preferences.ActivityPermissionRequestor

app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt

@@ -22,8 +22,8 @@ import net.fortuna.ical4j.model.WeekDay
 import org.tasks.R
 import org.tasks.compose.collectAsStateLifecycleAware
 import org.tasks.compose.edit.RepeatRow
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
 import org.tasks.repeats.BasicRecurrenceDialog
 import org.tasks.repeats.RecurrenceUtils.newRecur
 import org.tasks.repeats.RepeatRuleToString

app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt

@@ -8,14 +8,14 @@ package com.todoroo.astrid.repeats
 import com.todoroo.andlib.utility.DateUtilities
 import com.todoroo.astrid.alarms.AlarmService
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.gcal.GCalHelper
 import net.fortuna.ical4j.model.Date
 import net.fortuna.ical4j.model.Recur
 import net.fortuna.ical4j.model.WeekDay
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.Alarm
+import org.tasks.data.entity.Alarm
-import org.tasks.data.Alarm.Companion.TYPE_SNOOZE
+import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE
 import org.tasks.data.createDueDate
 import org.tasks.data.setRecurrence
 import org.tasks.date.DateTimeUtils.newDateTime

app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt

@@ -7,14 +7,14 @@ import android.media.AudioAttributes
 import android.media.AudioAttributes.USAGE_NOTIFICATION_EVENT
 import android.media.RingtoneManager
 import androidx.room.withTransaction
-import com.todoroo.astrid.dao.Database
+import org.tasks.data.db.Database
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.gcal.GCalHelper
 import com.todoroo.astrid.repeats.RepeatTaskHelper
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
 import org.tasks.preferences.Preferences
 import org.tasks.time.DateTimeUtils2.currentTimeMillis
 import timber.log.Timber

app/src/main/java/com/todoroo/astrid/service/TaskCreator.kt

@@ -7,32 +7,32 @@ import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.api.GtasksFilter
 import com.todoroo.astrid.api.PermaSql
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
-import com.todoroo.astrid.data.Task.Companion.DUE_DATE
+import org.tasks.data.entity.Task.Companion.DUE_DATE
-import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL
+import org.tasks.data.entity.Task.Companion.HIDE_UNTIL
-import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL_NONE
+import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_NONE
-import com.todoroo.astrid.data.Task.Companion.IMPORTANCE
+import org.tasks.data.entity.Task.Companion.IMPORTANCE
 import com.todoroo.astrid.gcal.GCalHelper
-import com.todoroo.astrid.helper.UUIDHelper
+import org.tasks.data.UUIDHelper
 import com.todoroo.astrid.utility.TitleParser.parse
 import org.tasks.R
 import org.tasks.Strings.isNullOrEmpty
-import org.tasks.data.Alarm
+import org.tasks.data.entity.Alarm
-import org.tasks.data.Alarm.Companion.TYPE_RANDOM
+import org.tasks.data.entity.Alarm.Companion.TYPE_RANDOM
-import org.tasks.data.Alarm.Companion.whenDue
+import org.tasks.data.entity.Alarm.Companion.whenDue
-import org.tasks.data.Alarm.Companion.whenOverdue
+import org.tasks.data.entity.Alarm.Companion.whenOverdue
-import org.tasks.data.Alarm.Companion.whenStarted
+import org.tasks.data.entity.Alarm.Companion.whenStarted
-import org.tasks.data.AlarmDao
+import org.tasks.data.dao.AlarmDao
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.CaldavTask
+import org.tasks.data.entity.CaldavTask
 import org.tasks.data.GoogleTask
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
-import org.tasks.data.LocationDao
+import org.tasks.data.dao.LocationDao
-import org.tasks.data.Place
+import org.tasks.data.entity.Place
-import org.tasks.data.Tag
+import org.tasks.data.entity.Tag
-import org.tasks.data.TagDao
+import org.tasks.data.dao.TagDao
-import org.tasks.data.TagData
+import org.tasks.data.entity.TagData
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
 import org.tasks.data.createDueDate
 import org.tasks.data.createGeofence
 import org.tasks.data.createHideUntil
@@ -44,16 +44,16 @@ import timber.log.Timber
 import javax.inject.Inject
 
 class TaskCreator @Inject constructor(
-        private val gcalHelper: GCalHelper,
+    private val gcalHelper: GCalHelper,
-        private val preferences: Preferences,
+    private val preferences: Preferences,
-        private val tagDataDao: TagDataDao,
+    private val tagDataDao: TagDataDao,
-        private val taskDao: TaskDao,
+    private val taskDao: TaskDao,
-        private val tagDao: TagDao,
+    private val tagDao: TagDao,
-        private val googleTaskDao: GoogleTaskDao,
+    private val googleTaskDao: GoogleTaskDao,
-        private val defaultFilterProvider: DefaultFilterProvider,
+    private val defaultFilterProvider: DefaultFilterProvider,
-        private val caldavDao: CaldavDao,
+    private val caldavDao: CaldavDao,
-        private val locationDao: LocationDao,
+    private val locationDao: LocationDao,
-        private val alarmDao: AlarmDao,
+    private val alarmDao: AlarmDao,
 ) {
 
     suspend fun basicQuickAddTask(title: String): Task {

app/src/main/java/com/todoroo/astrid/service/TaskDeleter.kt

@@ -2,8 +2,8 @@ package com.todoroo.astrid.service
 
 import android.content.Context
 import androidx.room.withTransaction
-import com.todoroo.astrid.dao.Database
+import org.tasks.data.db.Database
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.timers.TimerPlugin
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.NonCancellable
@@ -11,13 +11,13 @@ import kotlinx.coroutines.withContext
 import org.tasks.BuildConfig
 import org.tasks.LocalBroadcastManager
 import org.tasks.caldav.VtodoCache
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.DeletionDao
+import org.tasks.data.dao.DeletionDao
-import org.tasks.data.LocationDao
+import org.tasks.data.dao.LocationDao
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
-import org.tasks.data.UserActivityDao
+import org.tasks.data.dao.UserActivityDao
-import org.tasks.db.SuspendDbUtils.chunkedMap
+import org.tasks.data.db.SuspendDbUtils.chunkedMap
 import org.tasks.files.FileHelper
 import org.tasks.location.GeofenceApi
 import org.tasks.notifications.NotificationManager

app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt

@@ -1,39 +1,39 @@
 package com.todoroo.astrid.service
 
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
-import com.todoroo.astrid.data.Task.Companion.NO_ID
+import org.tasks.data.entity.Task.Companion.NO_ID
 import com.todoroo.astrid.gcal.GCalHelper
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.Alarm
+import org.tasks.data.entity.Alarm
-import org.tasks.data.AlarmDao
+import org.tasks.data.dao.AlarmDao
-import org.tasks.data.Attachment
+import org.tasks.data.entity.Attachment
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.CaldavTask
+import org.tasks.data.entity.CaldavTask
-import org.tasks.data.Geofence
+import org.tasks.data.entity.Geofence
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
-import org.tasks.data.LocationDao
+import org.tasks.data.dao.LocationDao
-import org.tasks.data.Tag
+import org.tasks.data.entity.Tag
-import org.tasks.data.TagDao
+import org.tasks.data.dao.TagDao
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
-import org.tasks.data.TaskAttachmentDao
+import org.tasks.data.dao.TaskAttachmentDao
-import org.tasks.db.DbUtils.dbchunk
+import org.tasks.data.db.DbUtils.dbchunk
 import org.tasks.preferences.Preferences
 import org.tasks.time.DateTimeUtils2.currentTimeMillis
 import javax.inject.Inject
 
 class TaskDuplicator @Inject constructor(
-        private val gcalHelper: GCalHelper,
+    private val gcalHelper: GCalHelper,
-        private val taskDao: TaskDao,
+    private val taskDao: TaskDao,
-        private val localBroadcastManager: LocalBroadcastManager,
+    private val localBroadcastManager: LocalBroadcastManager,
-        private val tagDao: TagDao,
+    private val tagDao: TagDao,
-        private val tagDataDao: TagDataDao,
+    private val tagDataDao: TagDataDao,
-        private val googleTaskDao: GoogleTaskDao,
+    private val googleTaskDao: GoogleTaskDao,
-        private val caldavDao: CaldavDao,
+    private val caldavDao: CaldavDao,
-        private val locationDao: LocationDao,
+    private val locationDao: LocationDao,
-        private val alarmDao: AlarmDao,
+    private val alarmDao: AlarmDao,
-        private val preferences: Preferences,
+    private val preferences: Preferences,
-        private val taskAttachmentDao: TaskAttachmentDao,
+    private val taskAttachmentDao: TaskAttachmentDao,
 ) {
 
     suspend fun duplicate(taskIds: List<Long>): List<Task> {
@@ -91,7 +91,8 @@ class TaskDuplicator @Inject constructor(
         }
         for (g in locationDao.getGeofencesForTask(task.id)) {
             locationDao.insert(
-                    Geofence(clone.id, g.place, g.isArrival, g.isDeparture))
+                    Geofence(clone.id, g.place, g.isArrival, g.isDeparture)
+            )
         }
         val alarms = alarmDao.getAlarms(task.id)
         if (alarms.isNotEmpty()) {

app/src/main/java/com/todoroo/astrid/service/TaskMover.kt

@@ -8,30 +8,30 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import org.tasks.BuildConfig
 import org.tasks.LocalBroadcastManager
 import org.tasks.caldav.VtodoCache
-import org.tasks.data.CaldavAccount
+import org.tasks.data.entity.CaldavAccount
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.CaldavTask
+import org.tasks.data.entity.CaldavTask
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.GoogleTaskDao
-import org.tasks.data.GoogleTaskListDao
+import org.tasks.data.dao.GoogleTaskListDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
 import org.tasks.data.getLocalList
-import org.tasks.db.DbUtils.dbchunk
+import org.tasks.data.db.DbUtils.dbchunk
 import org.tasks.preferences.Preferences
 import org.tasks.sync.SyncAdapters
 import org.tasks.time.DateTimeUtils2.currentTimeMillis
 import javax.inject.Inject
 
 class TaskMover @Inject constructor(
-        @param:ApplicationContext private val context: Context,
+    @param:ApplicationContext private val context: Context,
-        private val taskDao: TaskDao,
+    private val taskDao: TaskDao,
-        private val caldavDao: CaldavDao,
+    private val caldavDao: CaldavDao,
-        private val googleTaskDao: GoogleTaskDao,
+    private val googleTaskDao: GoogleTaskDao,
-        private val googleTaskListDao: GoogleTaskListDao,
+    private val googleTaskListDao: GoogleTaskListDao,
-        private val preferences: Preferences,
+    private val preferences: Preferences,
-        private val localBroadcastManager: LocalBroadcastManager,
+    private val localBroadcastManager: LocalBroadcastManager,
-        private val syncAdapters: SyncAdapters,
+    private val syncAdapters: SyncAdapters,
-        private val vtodoCache: VtodoCache,
+    private val vtodoCache: VtodoCache,
 ) {
 
     suspend fun getSingleFilter(tasks: List<Long>): Filter? {

app/src/main/java/com/todoroo/astrid/service/Upgrade_11_12_3.kt

@@ -2,8 +2,8 @@
 
 package com.todoroo.astrid.service
 
-import com.todoroo.astrid.data.Task.Companion.NOTIFY_AFTER_DEADLINE
+import org.tasks.data.entity.Task.Companion.NOTIFY_AFTER_DEADLINE
-import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_DEADLINE
+import org.tasks.data.entity.Task.Companion.NOTIFY_AT_DEADLINE
 import org.tasks.R
 import org.tasks.preferences.Preferences
 import javax.inject.Inject

app/src/main/java/com/todoroo/astrid/service/Upgrade_11_3.kt

@@ -6,15 +6,15 @@ import org.tasks.caldav.VtodoCache
 import org.tasks.caldav.iCalendar
 import org.tasks.caldav.iCalendar.Companion.apply
 import org.tasks.data.OpenTaskDao
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
-import org.tasks.data.UpgraderDao
+import org.tasks.data.dao.UpgraderDao
 import javax.inject.Inject
 
 class Upgrade_11_3 @Inject constructor(
-        private val upgraderDao: UpgraderDao,
+    private val upgraderDao: UpgraderDao,
-        private val openTaskDao: OpenTaskDao,
+    private val openTaskDao: OpenTaskDao,
-        private val taskDao: TaskDao,
+    private val taskDao: TaskDao,
-        private val vtodoCache: VtodoCache,
+    private val vtodoCache: VtodoCache,
 ) {
     internal suspend fun applyiCalendarStartDates() {
         val (hasStartDate, noStartDate) =

app/src/main/java/com/todoroo/astrid/service/Upgrade_12_4.kt

@@ -5,10 +5,10 @@ package com.todoroo.astrid.service
 import org.tasks.caldav.VtodoCache
 import org.tasks.caldav.iCalendar
 import org.tasks.caldav.iCalendar.Companion.reminders
-import org.tasks.data.AlarmDao
+import org.tasks.data.dao.AlarmDao
 import org.tasks.data.CaldavTaskContainer
-import org.tasks.data.TaskDao
+import org.tasks.data.dao.TaskDao
-import org.tasks.data.UpgraderDao
+import org.tasks.data.dao.UpgraderDao
 import javax.inject.Inject
 
 class Upgrade_12_4 @Inject constructor(

app/src/main/java/com/todoroo/astrid/service/Upgrade_13_2.kt

@@ -2,7 +2,7 @@
 
 package com.todoroo.astrid.service
 
-import org.tasks.data.FilterDao
+import org.tasks.data.dao.FilterDao
 import org.tasks.filters.FilterCriteriaProvider
 import javax.inject.Inject
 

app/src/main/java/com/todoroo/astrid/service/Upgrader.kt

@@ -18,21 +18,21 @@ import org.tasks.caldav.iCalendar
 import org.tasks.caldav.iCalendar.Companion.fromVtodo
 import org.tasks.caldav.iCalendar.Companion.order
 import org.tasks.caldav.iCalendar.Companion.parent
-import org.tasks.data.CaldavDao
+import org.tasks.data.dao.CaldavDao
-import org.tasks.data.CaldavTask
+import org.tasks.data.entity.CaldavTask
 import org.tasks.data.CaldavTaskContainer
-import org.tasks.data.Filter
+import org.tasks.data.entity.Filter
-import org.tasks.data.FilterDao
+import org.tasks.data.dao.FilterDao
-import org.tasks.data.GoogleTaskListDao
+import org.tasks.data.dao.GoogleTaskListDao
 import org.tasks.data.Location
-import org.tasks.data.LocationDao
+import org.tasks.data.dao.LocationDao
-import org.tasks.data.Tag
+import org.tasks.data.entity.Tag
-import org.tasks.data.TagDao
+import org.tasks.data.dao.TagDao
-import org.tasks.data.TagData
+import org.tasks.data.entity.TagData
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
-import org.tasks.data.TaskAttachmentDao
+import org.tasks.data.dao.TaskAttachmentDao
-import org.tasks.data.UpgraderDao
+import org.tasks.data.dao.UpgraderDao
-import org.tasks.data.UserActivityDao
+import org.tasks.data.dao.UserActivityDao
 import org.tasks.preferences.DefaultFilterProvider
 import org.tasks.preferences.Preferences
 import org.tasks.time.DateTimeUtils2.currentTimeMillis
@@ -42,27 +42,27 @@ import java.io.File
 import javax.inject.Inject
 
 class Upgrader @Inject constructor(
-        @param:ApplicationContext private val context: Context,
+    @param:ApplicationContext private val context: Context,
-        private val preferences: Preferences,
+    private val preferences: Preferences,
-        private val tagDataDao: TagDataDao,
+    private val tagDataDao: TagDataDao,
-        private val tagDao: TagDao,
+    private val tagDao: TagDao,
-        private val filterDao: FilterDao,
+    private val filterDao: FilterDao,
-        private val defaultFilterProvider: DefaultFilterProvider,
+    private val defaultFilterProvider: DefaultFilterProvider,
-        private val googleTaskListDao: GoogleTaskListDao,
+    private val googleTaskListDao: GoogleTaskListDao,
-        private val userActivityDao: UserActivityDao,
+    private val userActivityDao: UserActivityDao,
-        private val taskAttachmentDao: TaskAttachmentDao,
+    private val taskAttachmentDao: TaskAttachmentDao,
-        private val caldavDao: CaldavDao,
+    private val caldavDao: CaldavDao,
-        private val taskDao: TaskDao,
+    private val taskDao: TaskDao,
-        private val locationDao: LocationDao,
+    private val locationDao: LocationDao,
-        private val iCal: iCalendar,
+    private val iCal: iCalendar,
-        private val widgetManager: AppWidgetManager,
+    private val widgetManager: AppWidgetManager,
-        private val taskMover: TaskMover,
+    private val taskMover: TaskMover,
-        private val upgraderDao: UpgraderDao,
+    private val upgraderDao: UpgraderDao,
-        private val vtodoCache: VtodoCache,
+    private val vtodoCache: VtodoCache,
-        private val upgrade_11_3: Lazy<Upgrade_11_3>,
+    private val upgrade_11_3: Lazy<Upgrade_11_3>,
-        private val upgrade_11_12_3: Lazy<Upgrade_11_12_3>,
+    private val upgrade_11_12_3: Lazy<Upgrade_11_12_3>,
-        private val upgrade_12_4: Lazy<Upgrade_12_4>,
+    private val upgrade_12_4: Lazy<Upgrade_12_4>,
-        private val upgrade_13_2: Lazy<Upgrade_13_2>,
+    private val upgrade_13_2: Lazy<Upgrade_13_2>,
 ) {
 
     fun upgrade(from: Int, to: Int) {

app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.kt

@@ -2,21 +2,21 @@ package com.todoroo.astrid.subtasks
 
 import com.todoroo.astrid.api.AstridOrderingFilter
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
-import com.todoroo.astrid.data.Task.Companion.isValidUuid
+import org.tasks.data.entity.Task.Companion.isValidUuid
 import org.json.JSONArray
 import org.json.JSONException
 import org.tasks.Strings.isNullOrEmpty
-import org.tasks.data.TaskListMetadata
+import org.tasks.data.entity.TaskListMetadata
-import org.tasks.data.TaskListMetadataDao
+import org.tasks.data.dao.TaskListMetadataDao
 import org.tasks.db.QueryUtils.showHiddenAndCompleted
 import timber.log.Timber
 import java.util.*
 import javax.inject.Inject
 
 class SubtasksFilterUpdater @Inject constructor(
-        private val taskListMetadataDao: TaskListMetadataDao,
+    private val taskListMetadataDao: TaskListMetadataDao,
-        private val taskDao: TaskDao
+    private val taskDao: TaskDao
 ) {
     private val idToNode = HashMap<String, Node?>()
     private var treeRoot: Node? = null

app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.kt

@@ -6,26 +6,27 @@ import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.core.BuiltInFilterExposer.Companion.isInbox
 import com.todoroo.astrid.core.BuiltInFilterExposer.Companion.isTodayFilter
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task.Companion.isValidUuid
+import org.tasks.data.entity.Task.Companion.isValidUuid
 import com.todoroo.astrid.subtasks.SubtasksFilterUpdater.Companion.buildOrderString
 import com.todoroo.astrid.subtasks.SubtasksFilterUpdater.Companion.buildTreeModel
 import com.todoroo.astrid.subtasks.SubtasksFilterUpdater.Companion.serializeTree
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.tasks.Strings.isNullOrEmpty
-import org.tasks.data.TagData
+import org.tasks.data.entity.TagData
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
-import org.tasks.data.TaskListMetadata
+import org.tasks.data.entity.TaskListMetadata
-import org.tasks.data.TaskListMetadataDao
+import org.tasks.data.dao.TaskListMetadataDao
 import org.tasks.db.QueryUtils.showHiddenAndCompleted
 import org.tasks.preferences.QueryPreferences
 import timber.log.Timber
 import javax.inject.Inject
 
 class SubtasksHelper @Inject constructor(
-        @param:ApplicationContext private val context: Context,
+    @param:ApplicationContext private val context: Context,
-        private val taskDao: TaskDao,
+    private val taskDao: TaskDao,
-        private val tagDataDao: TagDataDao,
+    private val tagDataDao: TagDataDao,
-        private val taskListMetadataDao: TaskListMetadataDao) {
+    private val taskListMetadataDao: TaskListMetadataDao
+) {
 
     suspend fun applySubtasksToWidgetFilter(
             filter: Filter,

app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.kt

@@ -15,7 +15,7 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.composethemeadapter.MdcTheme
 import com.todoroo.andlib.utility.DateUtilities
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.ui.TimeDurationControlSet
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch