From 55adbc2025adf687bf06f626ee26d84597e63c61 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 12 May 2024 00:31:41 -0500 Subject: [PATCH] Reorganized data module --- .../CaldavManualSortTaskAdapterTest.kt | 8 +- .../astrid/adapter/CaldavTaskAdapterTest.kt | 3 + .../GoogleTaskManualSortAdapterTest.kt | 6 +- .../astrid/adapter/OfflineSubtaskTest.kt | 6 +- .../astrid/adapter/RecursiveLoopTest.kt | 2 +- .../astrid/alarms/AlarmJobServiceTest.kt | 16 ++-- .../com/todoroo/astrid/dao/TaskDaoTests.kt | 2 +- .../astrid/gtasks/GtasksListServiceTest.kt | 6 +- .../java/com/todoroo/astrid/model/TaskTest.kt | 2 +- .../astrid/repeats/RepeatWithSubtasksTests.kt | 4 +- .../astrid/service/QuickAddMarkupTest.kt | 4 +- .../todoroo/astrid/service/TaskCreatorTest.kt | 8 +- .../todoroo/astrid/service/TaskDeleterTest.kt | 4 +- .../todoroo/astrid/service/TaskMoverTest.kt | 12 +-- .../todoroo/astrid/service/TitleParserTest.kt | 4 +- .../astrid/service/Upgrade_11_3_Test.kt | 8 +- .../astrid/subtasks/SubtasksHelperTest.kt | 4 +- .../astrid/subtasks/SubtasksMovingTest.kt | 4 +- .../astrid/subtasks/SubtasksTestCase.kt | 4 +- .../todoroo/astrid/sync/NewSyncTestCase.kt | 6 +- .../com/todoroo/astrid/sync/SyncModelTest.kt | 2 +- .../tasks/caldav/CaldavSynchronizerTest.kt | 18 ++-- .../java/org/tasks/caldav/CaldavTest.kt | 4 +- .../org/tasks/caldav/ServerDetectionTest.kt | 18 ++-- .../tasks/caldav/SharingMailboxDotOrgTest.kt | 10 +-- .../org/tasks/caldav/SharingOwncloudTest.kt | 12 +-- .../org/tasks/caldav/SharingSabredavTest.kt | 14 +-- .../org/tasks/data/CaldavDaoShiftTests.kt | 3 + .../java/org/tasks/data/CaldavDaoTests.kt | 6 +- .../java/org/tasks/data/DeletionDaoTests.kt | 7 +- .../java/org/tasks/data/GoogleTaskDaoTests.kt | 7 +- .../org/tasks/data/GoogleTaskListDaoTest.kt | 3 + .../java/org/tasks/data/LocationDaoTest.kt | 9 +- .../tasks/data/ManualGoogleTaskQueryTest.kt | 4 +- .../java/org/tasks/data/TagDataDaoTest.kt | 2 + .../java/org/tasks/data/TaskDaoTests.kt | 3 +- .../java/org/tasks/data/UpgraderDaoTests.kt | 5 ++ .../gtasks/GoogleTaskSynchronizerTest.kt | 2 +- .../java/org/tasks/injection/TestModule.kt | 2 +- .../java/org/tasks/jobs/BackupServiceTests.kt | 2 +- .../tasks/opentasks/OpenTasksDueDateTests.kt | 2 +- .../opentasks/OpenTasksPropertiesTests.kt | 12 +-- .../opentasks/OpenTasksSynchronizerTest.kt | 6 +- .../java/org/tasks/opentasks/OpenTasksTest.kt | 4 +- .../org/tasks/opentasks/TestOpenTaskDao.kt | 6 +- .../org/tasks/preferences/PreferenceTests.kt | 6 +- .../BaseTaskEditViewModelTest.kt | 12 +-- .../tasks/ui/editviewmodel/PriorityTests.kt | 2 +- .../tasks/ui/editviewmodel/ReminderTests.kt | 6 +- .../ui/editviewmodel/TaskEditViewModelTest.kt | 2 +- .../ui/editviewmodel/TaskListViewModelTest.kt | 6 +- .../org/tasks/ui/editviewmodel/TitleTests.kt | 2 +- .../java/org/tasks/billing/InventoryTest.kt | 2 +- .../tasks/caldav/CaldavSubscriptionTest.kt | 4 +- .../java/org/tasks/FlipperHttpInterceptor.kt | 2 +- .../GoogleGeofenceTransitionIntentService.kt | 2 +- .../org/tasks/location/GoogleMapFragment.kt | 2 +- .../location/LocationServiceGooglePlay.kt | 2 +- .../todoroo/andlib/utility/DateUtilities.java | 2 +- .../todoroo/astrid/activity/MainActivity.kt | 10 +-- .../astrid/activity/MainActivityViewModel.kt | 6 +- .../astrid/activity/ShareLinkActivity.kt | 4 +- .../astrid/activity/TaskEditFragment.kt | 8 +- .../astrid/activity/TaskListFragment.kt | 16 ++-- .../astrid/adapter/AstridTaskAdapter.kt | 8 +- .../adapter/CaldavManualSortTaskAdapter.kt | 14 +-- .../adapter/GoogleTaskManualSortAdapter.kt | 14 +-- .../astrid/adapter/SubheaderClickHandler.kt | 2 +- .../com/todoroo/astrid/adapter/TaskAdapter.kt | 24 ++--- .../astrid/adapter/TaskAdapterProvider.kt | 26 +++--- .../todoroo/astrid/alarms/AlarmCalculator.kt | 4 +- .../com/todoroo/astrid/alarms/AlarmService.kt | 8 +- .../com/todoroo/astrid/api/CaldavFilter.kt | 14 +-- .../com/todoroo/astrid/api/CustomFilter.kt | 2 +- .../com/todoroo/astrid/api/GtasksFilter.kt | 14 +-- .../com/todoroo/astrid/api/SearchFilter.kt | 22 ++--- .../java/com/todoroo/astrid/api/TagFilter.kt | 14 +-- .../astrid/core/BuiltInFilterExposer.kt | 18 ++-- .../todoroo/astrid/core/CriterionInstance.kt | 2 +- .../com/todoroo/astrid/core/SortHelper.java | 12 +-- .../java/com/todoroo/astrid/dao/TaskDao.kt | 20 ++--- .../todoroo/astrid/files/FilesControlSet.kt | 4 +- .../com/todoroo/astrid/gcal/GCalHelper.kt | 14 +-- .../astrid/gtasks/GtasksListService.kt | 12 +-- .../astrid/gtasks/auth/GtasksLoginActivity.kt | 8 +- .../astrid/repeats/RepeatControlSet.kt | 4 +- .../astrid/repeats/RepeatTaskHelper.kt | 6 +- .../todoroo/astrid/service/TaskCompleter.kt | 6 +- .../com/todoroo/astrid/service/TaskCreator.kt | 62 ++++++------- .../com/todoroo/astrid/service/TaskDeleter.kt | 18 ++-- .../todoroo/astrid/service/TaskDuplicator.kt | 55 ++++++------ .../com/todoroo/astrid/service/TaskMover.kt | 34 +++---- .../todoroo/astrid/service/Upgrade_11_12_3.kt | 4 +- .../todoroo/astrid/service/Upgrade_11_3.kt | 12 +-- .../todoroo/astrid/service/Upgrade_12_4.kt | 6 +- .../todoroo/astrid/service/Upgrade_13_2.kt | 2 +- .../com/todoroo/astrid/service/Upgrader.kt | 68 +++++++------- .../astrid/subtasks/SubtasksFilterUpdater.kt | 12 +-- .../todoroo/astrid/subtasks/SubtasksHelper.kt | 19 ++-- .../todoroo/astrid/timers/TimerControlSet.kt | 2 +- .../com/todoroo/astrid/timers/TimerPlugin.kt | 4 +- .../todoroo/astrid/ui/ReminderControlSet.kt | 4 +- .../astrid/ui/ReminderControlSetViewModel.kt | 2 +- .../todoroo/astrid/ui/StartDateViewModel.kt | 2 +- .../com/todoroo/astrid/utility/TitleParser.kt | 4 +- app/src/main/java/org/tasks/Notifier.kt | 26 +++--- .../tasks/activities/DeleteListViewModel.kt | 2 +- .../activities/FilterSettingsActivity.kt | 16 ++-- .../GoogleTaskListSettingsActivity.kt | 6 +- .../NavigationDrawerCustomization.kt | 10 +-- .../tasks/activities/PlaceSettingsActivity.kt | 4 +- .../tasks/activities/RenameListViewModel.kt | 2 +- .../tasks/activities/TagSettingsActivity.kt | 8 +- .../java/org/tasks/activities/UriHandler.kt | 2 +- .../auth/MicrosoftAuthenticationActivity.kt | 8 +- .../java/org/tasks/auth/SignInViewModel.kt | 16 ++-- .../java/org/tasks/backup/BackupContainer.kt | 45 ++++++---- .../org/tasks/backup/TasksJsonExporter.kt | 38 +++++--- .../org/tasks/backup/TasksJsonImporter.kt | 68 +++++++------- .../main/java/org/tasks/billing/Inventory.kt | 4 +- .../BaseCaldavAccountSettingsActivity.kt | 8 +- .../BaseCaldavCalendarSettingsActivity.kt | 13 +-- .../caldav/CaldavAccountSettingsActivity.kt | 4 +- .../caldav/CaldavCalendarSettingsActivity.kt | 24 ++--- .../tasks/caldav/CaldavCalendarViewModel.kt | 10 ++- .../java/org/tasks/caldav/CaldavClient.kt | 14 +-- .../org/tasks/caldav/CaldavClientProvider.kt | 2 +- .../org/tasks/caldav/CaldavSynchronizer.kt | 79 ++++++++-------- .../main/java/org/tasks/caldav/GeoUtils.kt | 2 +- .../tasks/caldav/LocalListSettingsActivity.kt | 8 +- .../main/java/org/tasks/caldav/VtodoCache.kt | 8 +- .../org/tasks/caldav/extensions/VAlarm.kt | 2 +- .../main/java/org/tasks/caldav/iCalendar.kt | 82 ++++++++--------- .../java/org/tasks/caldav/iCalendarMerge.kt | 34 +++---- .../calendars/CalendarEventProvider.java | 2 +- .../org/tasks/compose/AddReminderDialog.kt | 12 +-- .../main/java/org/tasks/compose/CheckBox.kt | 2 +- .../java/org/tasks/compose/PrincipalList.kt | 14 +-- .../java/org/tasks/compose/StartDateChip.kt | 2 +- .../java/org/tasks/compose/edit/AlarmRow.kt | 2 +- .../org/tasks/compose/edit/AttachmentRow.kt | 2 +- .../org/tasks/compose/edit/CommentsRow.kt | 2 +- .../org/tasks/compose/edit/LocationRow.kt | 4 +- .../org/tasks/compose/edit/PriorityRow.kt | 2 +- .../java/org/tasks/compose/edit/SubtaskRow.kt | 2 +- .../java/org/tasks/compose/edit/TagsRow.kt | 2 +- .../org/tasks/dashclock/DashClockExtension.kt | 2 +- .../org/tasks/data/CaldavAccountExtensions.kt | 1 + .../org/tasks/data/CaldavDaoExtensions.kt | 4 +- .../tasks/data/ContentProviderDaoBlocking.kt | 4 +- .../org/tasks/data/LocationDaoExtensions.kt | 5 +- .../main/java/org/tasks/data/OpenTaskDao.kt | 6 +- .../java/org/tasks/data/PlaceExtensions.kt | 1 + .../org/tasks/data/TagDataDaoExtensions.kt | 2 + .../java/org/tasks/data/TaskDaoExtensions.kt | 9 +- .../java/org/tasks/data/TaskExtensions.kt | 2 +- .../main/java/org/tasks/data/TaskListQuery.kt | 18 ++-- .../tasks/data/TaskListQueryNonRecursive.kt | 9 +- .../org/tasks/data/TaskListQueryRecursive.kt | 25 +++--- app/src/main/java/org/tasks/db/Migrations.kt | 24 ++--- .../java/org/tasks/dialogs/DateTimePicker.kt | 2 +- .../tasks/dialogs/FilterPickerViewModel.kt | 2 +- .../org/tasks/dialogs/GeofenceDialog.java | 2 +- .../java/org/tasks/dialogs/PriorityPicker.kt | 2 +- .../tasks/dialogs/PriorityPickerViewModel.kt | 2 +- .../java/org/tasks/dialogs/StartDatePicker.kt | 2 +- .../tasks/etebase/CreateCalendarViewModel.kt | 2 +- .../tasks/etebase/DeleteCalendarViewModel.kt | 4 +- .../etebase/EtebaseAccountSettingsActivity.kt | 6 +- .../EtebaseCalendarSettingsActivity.kt | 6 +- .../java/org/tasks/etebase/EtebaseClient.kt | 12 +-- .../tasks/etebase/EtebaseClientProvider.kt | 12 +-- .../org/tasks/etebase/EtebaseSynchronizer.kt | 24 ++--- .../tasks/etebase/UpdateCalendarViewModel.kt | 4 +- .../org/tasks/filters/AlphanumComparator.kt | 2 +- .../tasks/filters/FilterCriteriaProvider.kt | 46 +++++----- .../java/org/tasks/filters/FilterProvider.kt | 34 +++---- .../java/org/tasks/filters/MyTasksFilter.kt | 8 +- .../org/tasks/filters/NotificationsFilter.kt | 8 +- .../java/org/tasks/filters/PlaceFilter.kt | 16 ++-- .../tasks/filters/RecentlyModifiedFilter.kt | 8 +- .../java/org/tasks/filters/SnoozedFilter.kt | 14 +-- .../java/org/tasks/filters/TimerFilter.kt | 6 +- .../java/org/tasks/filters/TodayFilter.kt | 8 +- .../tasks/gtasks/GoogleTaskSynchronizer.kt | 55 +++++++----- .../java/org/tasks/http/HttpClientFactory.kt | 2 +- .../org/tasks/injection/ApplicationModule.kt | 32 +++---- .../org/tasks/injection/ProductionModule.kt | 12 +-- .../java/org/tasks/intents/TaskIntents.java | 2 +- .../main/java/org/tasks/jobs/AlarmEntry.java | 2 +- .../java/org/tasks/jobs/MigrateLocalWork.kt | 16 ++-- .../java/org/tasks/jobs/NotificationWork.kt | 6 +- .../main/java/org/tasks/jobs/RefreshWork.kt | 2 +- .../java/org/tasks/jobs/ReverseGeocodeWork.kt | 7 +- app/src/main/java/org/tasks/jobs/SyncWork.kt | 10 +-- .../java/org/tasks/jobs/UpdateCalendarWork.kt | 16 ++-- .../main/java/org/tasks/jobs/WorkManager.kt | 6 +- .../java/org/tasks/jobs/WorkManagerImpl.kt | 16 ++-- .../locale/receiver/TaskerTaskCreator.kt | 12 +-- .../AndroidGeofenceTransitionIntentService.kt | 2 +- .../main/java/org/tasks/location/Geocoder.kt | 2 +- .../java/org/tasks/location/GeocoderMapbox.kt | 2 +- .../org/tasks/location/GeocoderNominatim.kt | 2 +- .../java/org/tasks/location/GeofenceApi.kt | 10 +-- .../tasks/location/LocationPickerActivity.kt | 4 +- .../tasks/location/LocationPickerAdapter.java | 2 +- .../org/tasks/location/LocationService.kt | 2 +- .../tasks/location/LocationServiceAndroid.kt | 2 +- .../java/org/tasks/location/MapFragment.kt | 2 +- .../java/org/tasks/location/OsmMapFragment.kt | 2 +- .../java/org/tasks/location/PlaceSearch.kt | 2 +- .../org/tasks/location/PlaceSearchGoogle.kt | 6 +- .../org/tasks/location/PlaceSearchMapbox.kt | 2 +- .../org/tasks/location/PlaceSearchResult.java | 2 +- .../tasks/location/PlaceSearchViewModel.kt | 10 +-- .../notifications/NotificationManager.kt | 10 +-- .../OpenTasksListSettingsActivity.kt | 6 +- .../tasks/opentasks/OpenTasksSynchronizer.kt | 30 +++---- .../preferences/DefaultFilterProvider.kt | 35 ++++---- .../java/org/tasks/preferences/Preferences.kt | 8 +- .../tasks/preferences/PreferencesViewModel.kt | 14 +-- .../tasks/preferences/fragments/Advanced.kt | 4 +- .../fragments/GoogleTasksAccount.kt | 6 +- .../fragments/MainSettingsFragment.kt | 2 +- .../preferences/fragments/MicrosoftAccount.kt | 6 +- .../preferences/fragments/TaskDefaults.kt | 16 ++-- .../preferences/fragments/TasksAccount.kt | 6 +- .../fragments/TasksAccountViewModel.kt | 2 +- .../tasks/provider/TasksContentProvider.kt | 2 +- .../org/tasks/receivers/RefreshReceiver.kt | 2 +- .../java/org/tasks/reminders/AlarmToString.kt | 2 +- .../tasks/reminders/NotificationActivity.kt | 2 +- .../repeats/CustomRecurrenceViewModel.kt | 2 +- .../java/org/tasks/repeats/RecurrenceUtils.kt | 2 +- .../main/java/org/tasks/sync/SyncAdapters.kt | 32 +++---- .../sync/microsoft/MicrosoftConverter.kt | 6 +- .../MicrosoftListSettingsActivity.kt | 4 +- .../MicrosoftListSettingsActivityViewModel.kt | 6 +- .../org/tasks/sync/microsoft/TaskLists.kt | 2 +- .../java/org/tasks/tags/TagPickerActivity.kt | 2 +- .../java/org/tasks/tags/TagPickerViewModel.kt | 4 +- .../org/tasks/tasklist/HeaderFormatter.kt | 2 +- .../java/org/tasks/themes/ColorProvider.kt | 2 +- .../main/java/org/tasks/time/DateTime.java | 2 +- .../java/org/tasks/ui/CheckBoxProvider.kt | 2 +- .../main/java/org/tasks/ui/ChipListCache.kt | 14 +-- .../java/org/tasks/ui/LocationControlSet.kt | 4 +- .../java/org/tasks/ui/SubtaskControlSet.kt | 10 +-- .../java/org/tasks/ui/TaskEditViewModel.kt | 90 +++++++++---------- .../java/org/tasks/ui/TaskListViewModel.kt | 6 +- .../tasks/widget/ShortcutConfigActivity.kt | 2 +- .../org/tasks/widget/TasksWidgetAdapter.kt | 2 +- .../tasks/widget/TasksWidgetViewFactory.kt | 2 +- .../org/tasks/widget/WidgetChipProvider.kt | 2 +- .../org/tasks/widget/WidgetClickActivity.kt | 2 +- .../astrid/alarms/AlarmCalculatorTest.kt | 24 ++--- .../java/com/todoroo/astrid/data/TaskTest.kt | 1 + .../com/todoroo/astrid/repeats/RepeatTests.kt | 2 +- app/src/test/java/org/tasks/TestUtilities.kt | 6 +- .../org/tasks/caldav/AppleRemindersTests.kt | 6 +- .../java/org/tasks/caldav/NextCloudTests.kt | 2 +- .../java/org/tasks/caldav/ThunderbirdTests.kt | 10 +-- .../tasks/caldav/extensions/VAlarmTests.kt | 8 +- .../org/tasks/caldav/iCalendarMergeTest.kt | 8 +- .../test/java/org/tasks/data/PrincipalTest.kt | 1 + .../test/java/org/tasks/db/QueryUtilsTest.kt | 4 +- .../java/org/tasks/makers/AlarmEntryMaker.kt | 2 +- .../org/tasks/makers/CaldavCalendarMaker.kt | 2 +- .../java/org/tasks/makers/CaldavTaskMaker.kt | 4 +- .../java/org/tasks/makers/TagDataMaker.kt | 2 +- .../test/java/org/tasks/makers/TagMaker.kt | 6 +- .../org/tasks/makers/TaskContainerMaker.kt | 2 +- .../test/java/org/tasks/makers/TaskMaker.kt | 6 +- .../microsoft/ConvertFromMicrosoftTests.kt | 2 +- .../sync/microsoft/ConvertToMicrosoftTests.kt | 4 +- .../39.json | 0 .../40.json | 0 .../41.json | 0 .../42.json | 0 .../43.json | 0 .../44.json | 0 .../45.json | 0 .../46.json | 0 .../47.json | 0 .../48.json | 0 .../49.json | 0 .../50.json | 0 .../51.json | 0 .../52.json | 0 .../53.json | 0 .../54.json | 0 .../55.json | 0 .../56.json | 0 .../57.json | 0 .../58.json | 0 .../59.json | 0 .../60.json | 0 .../61.json | 0 .../62.json | 0 .../63.json | 0 .../64.json | 0 .../65.json | 0 .../66.json | 0 .../67.json | 0 .../68.json | 0 .../69.json | 0 .../70.json | 0 .../71.json | 0 .../72.json | 0 .../73.json | 0 .../74.json | 0 .../75.json | 0 .../76.json | 0 .../77.json | 0 .../78.json | 0 .../79.json | 0 .../80.json | 0 .../81.json | 0 .../82.json | 0 .../83.json | 0 .../84.json | 0 .../85.json | 0 .../86.json | 0 .../87.json | 0 .../88.json | 0 .../kotlin/org/tasks/data/CaldavFilters.kt | 1 + .../org/tasks/data/CaldavTaskContainer.kt | 5 +- .../org/tasks/data/GoogleTaskFilters.kt | 1 + .../main/kotlin/org/tasks/data/Location.kt | 2 + .../kotlin/org/tasks/data/LocationFilters.kt | 1 + .../kotlin/org/tasks/data/MergedGeofence.kt | 1 + .../main/kotlin/org/tasks/data/PlaceUsage.kt | 1 + .../org/tasks/data/PrincipalWithAccess.kt | 2 + .../main/kotlin/org/tasks/data/TagFilters.kt | 1 + .../kotlin/org/tasks/data/TaskContainer.kt | 8 +- .../helper => org/tasks/data}/UUIDHelper.kt | 2 +- .../org/tasks/data/{ => dao}/AlarmDao.kt | 7 +- .../org/tasks/data/{ => dao}/CaldavDao.kt | 25 ++++-- .../data/{ => dao}/ContentProviderDao.kt | 5 +- .../org/tasks/data/{ => dao}/DeletionDao.kt | 10 ++- .../org/tasks/data/{ => dao}/FilterDao.kt | 4 +- .../org/tasks/data/{ => dao}/GoogleTaskDao.kt | 7 +- .../tasks/data/{ => dao}/GoogleTaskListDao.kt | 7 +- .../org/tasks/data/{ => dao}/LocationDao.kt | 11 ++- .../tasks/data/{ => dao}/NotificationDao.kt | 3 +- .../org/tasks/data/{ => dao}/PrincipalDao.kt | 7 +- .../kotlin/org/tasks/data/{ => dao}/TagDao.kt | 6 +- .../org/tasks/data/{ => dao}/TagDataDao.kt | 12 ++- .../tasks/data/{ => dao}/TaskAttachmentDao.kt | 4 +- .../org/tasks/data/{ => dao}/TaskDao.kt | 56 ++++++------ .../data/{ => dao}/TaskListMetadataDao.kt | 3 +- .../org/tasks/data/{ => dao}/UpgraderDao.kt | 3 +- .../tasks/data/{ => dao}/UserActivityDao.kt | 7 +- .../org/tasks/data/{ => db}/AutoMigrations.kt | 2 +- .../dao => org/tasks/data/db}/Database.kt | 71 ++++++++------- .../kotlin/org/tasks/{ => data}/db/DbUtils.kt | 2 +- .../data => org/tasks/data/db}/Property.kt | 4 +- .../org/tasks/{ => data}/db/SuspendDbUtils.kt | 6 +- .../data => org/tasks/data/db}/Table.kt | 4 +- .../org/tasks/data/{ => entity}/Alarm.kt | 5 +- .../org/tasks/data/{ => entity}/Attachment.kt | 9 +- .../tasks/data/{ => entity}/CaldavAccount.kt | 5 +- .../tasks/data/{ => entity}/CaldavCalendar.kt | 7 +- .../org/tasks/data/{ => entity}/CaldavTask.kt | 7 +- .../org/tasks/data/{ => entity}/Filter.kt | 3 +- .../org/tasks/data/{ => entity}/Geofence.kt | 5 +- .../tasks/data/{ => entity}/Notification.kt | 5 +- .../org/tasks/data/{ => entity}/Place.kt | 7 +- .../org/tasks/data/{ => entity}/Principal.kt | 2 +- .../data/{ => entity}/PrincipalAccess.kt | 6 +- .../kotlin/org/tasks/data/{ => entity}/Tag.kt | 5 +- .../org/tasks/data/{ => entity}/TagData.kt | 5 +- .../data => org/tasks/data/entity}/Task.kt | 7 +- .../tasks/data/{ => entity}/TaskAttachment.kt | 4 +- .../data/{ => entity}/TaskListMetadata.kt | 4 +- .../tasks/data/{ => entity}/UserActivity.kt | 5 +- .../tasks/data}/sql/Criterion.kt | 2 +- .../andlib => org/tasks/data}/sql/DBObject.kt | 2 +- .../andlib => org/tasks/data}/sql/Field.kt | 2 +- .../tasks/data}/sql/Functions.kt | 2 +- .../andlib => org/tasks/data}/sql/Join.kt | 4 +- .../andlib => org/tasks/data}/sql/JoinType.kt | 2 +- .../andlib => org/tasks/data}/sql/Operator.kt | 2 +- .../andlib => org/tasks/data}/sql/Order.kt | 6 +- .../tasks/data}/sql/OrderType.kt | 2 +- .../andlib => org/tasks/data}/sql/Query.kt | 12 +-- .../tasks/data}/sql/QueryTemplate.kt | 8 +- .../data}/sql/StringBuilderExtensions.kt | 4 +- .../tasks/data}/sql/UnaryCriterion.kt | 2 +- 389 files changed, 1601 insertions(+), 1429 deletions(-) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/39.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/40.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/41.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/42.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/43.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/44.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/45.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/46.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/47.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/48.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/49.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/50.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/51.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/52.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/53.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/54.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/55.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/56.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/57.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/58.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/59.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/60.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/61.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/62.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/63.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/64.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/65.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/66.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/67.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/68.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/69.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/70.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/71.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/72.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/73.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/74.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/75.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/76.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/77.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/78.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/79.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/80.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/81.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/82.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/83.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/84.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/85.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/86.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/87.json (100%) rename data/schemas/{com.todoroo.astrid.dao.Database => org.tasks.data.db.Database}/88.json (100%) rename data/src/main/kotlin/{com/todoroo/astrid/helper => org/tasks/data}/UUIDHelper.kt (90%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/AlarmDao.kt (89%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/CaldavDao.kt (95%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/ContentProviderDao.kt (93%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/DeletionDao.kt (91%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/FilterDao.kt (90%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/GoogleTaskDao.kt (97%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/GoogleTaskListDao.kt (88%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/LocationDao.kt (94%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/NotificationDao.kt (91%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/PrincipalDao.kt (89%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/TagDao.kt (92%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/TagDataDao.kt (95%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/TaskAttachmentDao.kt (91%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/TaskDao.kt (84%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/TaskListMetadataDao.kt (90%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/UpgraderDao.kt (93%) rename data/src/main/kotlin/org/tasks/data/{ => dao}/UserActivityDao.kt (90%) rename data/src/main/kotlin/org/tasks/data/{ => db}/AutoMigrations.kt (92%) rename data/src/main/kotlin/{com/todoroo/astrid/dao => org/tasks/data/db}/Database.kt (56%) rename data/src/main/kotlin/org/tasks/{ => data}/db/DbUtils.kt (82%) rename data/src/main/kotlin/{com/todoroo/andlib/data => org/tasks/data/db}/Property.kt (74%) rename data/src/main/kotlin/org/tasks/{ => data}/db/SuspendDbUtils.kt (79%) rename data/src/main/kotlin/{com/todoroo/andlib/data => org/tasks/data/db}/Table.kt (86%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/Alarm.kt (97%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/Attachment.kt (82%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/CaldavAccount.kt (97%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/CaldavCalendar.kt (93%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/CaldavTask.kt (92%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/Filter.kt (92%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/Geofence.kt (94%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/Notification.kt (92%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/Place.kt (95%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/Principal.kt (97%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/PrincipalAccess.kt (84%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/Tag.kt (94%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/TagData.kt (97%) rename data/src/main/kotlin/{com/todoroo/astrid/data => org/tasks/data/entity}/Task.kt (98%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/TaskAttachment.kt (90%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/TaskListMetadata.kt (91%) rename data/src/main/kotlin/org/tasks/data/{ => entity}/UserActivity.kt (96%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/Criterion.kt (97%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/DBObject.kt (94%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/Field.kt (98%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/Functions.kt (83%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/Join.kt (90%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/JoinType.kt (54%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/Operator.kt (94%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/Order.kt (85%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/OrderType.kt (54%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/Query.kt (82%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/QueryTemplate.kt (76%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/StringBuilderExtensions.kt (93%) rename data/src/main/kotlin/{com/todoroo/andlib => org/tasks/data}/sql/UnaryCriterion.kt (98%) diff --git a/app/src/androidTest/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapterTest.kt b/app/src/androidTest/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapterTest.kt index 0c40a534a..b92c26ddc 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapterTest.kt +++ b/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.CaldavDao -import org.tasks.data.GoogleTaskDao +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.GoogleTaskDao import org.tasks.data.TaskContainer import org.tasks.data.TaskListQuery.getQuery import org.tasks.injection.InjectingTestCase diff --git a/app/src/androidTest/java/com/todoroo/astrid/adapter/CaldavTaskAdapterTest.kt b/app/src/androidTest/java/com/todoroo/astrid/adapter/CaldavTaskAdapterTest.kt index afcde5c64..3a3d04f9c 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/adapter/CaldavTaskAdapterTest.kt +++ b/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 diff --git a/app/src/androidTest/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapterTest.kt b/app/src/androidTest/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapterTest.kt index fa03c3ac9..8381d6dbc 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapterTest.kt +++ b/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.GoogleTaskDao +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.GoogleTaskDao import org.tasks.data.TaskContainer import org.tasks.data.TaskListQuery.getQuery import org.tasks.injection.InjectingTestCase diff --git a/app/src/androidTest/java/com/todoroo/astrid/adapter/OfflineSubtaskTest.kt b/app/src/androidTest/java/com/todoroo/astrid/adapter/OfflineSubtaskTest.kt index b555d7bb2..5f2fb7773 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/adapter/OfflineSubtaskTest.kt +++ b/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.GoogleTaskDao +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.GoogleTaskDao import org.tasks.data.TaskContainer import org.tasks.data.TaskListQuery.getQuery import org.tasks.injection.InjectingTestCase diff --git a/app/src/androidTest/java/com/todoroo/astrid/adapter/RecursiveLoopTest.kt b/app/src/androidTest/java/com/todoroo/astrid/adapter/RecursiveLoopTest.kt index ea3912872..2f48c7e18 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/adapter/RecursiveLoopTest.kt +++ b/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 diff --git a/app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmJobServiceTest.kt b/app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmJobServiceTest.kt index 8f99a531a..0e7e3b6a9 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmJobServiceTest.kt +++ b/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.Alarm.Companion.TYPE_DATE_TIME -import org.tasks.data.Alarm.Companion.TYPE_RANDOM -import org.tasks.data.Alarm.Companion.TYPE_SNOOZE -import org.tasks.data.Alarm.Companion.whenDue -import org.tasks.data.Alarm.Companion.whenOverdue -import org.tasks.data.AlarmDao -import org.tasks.data.TaskDao +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_DATE_TIME +import org.tasks.data.entity.Alarm.Companion.TYPE_RANDOM +import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE +import org.tasks.data.entity.Alarm.Companion.whenDue +import org.tasks.data.entity.Alarm.Companion.whenOverdue +import org.tasks.data.dao.AlarmDao +import org.tasks.data.dao.TaskDao import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.injection.InjectingTestCase import org.tasks.injection.ProductionModule diff --git a/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.kt b/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.kt index 3ef68e32c..325fbd97d 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.kt +++ b/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 diff --git a/app/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.kt b/app/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.kt index bc09b2714..fc0b1e903 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.kt +++ b/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.CaldavDao -import org.tasks.data.GoogleTaskListDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.GoogleTaskListDao import org.tasks.injection.InjectingTestCase import org.tasks.injection.ProductionModule import org.tasks.makers.CaldavCalendarMaker.ID diff --git a/app/src/androidTest/java/com/todoroo/astrid/model/TaskTest.kt b/app/src/androidTest/java/com/todoroo/astrid/model/TaskTest.kt index 4df4aab25..b5978009f 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/model/TaskTest.kt +++ b/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 diff --git a/app/src/androidTest/java/com/todoroo/astrid/repeats/RepeatWithSubtasksTests.kt b/app/src/androidTest/java/com/todoroo/astrid/repeats/RepeatWithSubtasksTests.kt index edbf75eb4..3853ca07b 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/repeats/RepeatWithSubtasksTests.kt +++ b/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 diff --git a/app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.kt b/app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.kt index d6ee05366..b70a2b6e8 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.kt +++ b/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.* diff --git a/app/src/androidTest/java/com/todoroo/astrid/service/TaskCreatorTest.kt b/app/src/androidTest/java/com/todoroo/astrid/service/TaskCreatorTest.kt index a5c4765fc..19b49b870 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/service/TaskCreatorTest.kt +++ b/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 com.todoroo.astrid.data.Task.Companion.DUE_DATE -import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL -import com.todoroo.astrid.data.Task.Companion.URGENCY_SPECIFIC_DAY +import org.tasks.data.entity.Task +import org.tasks.data.entity.Task.Companion.DUE_DATE +import org.tasks.data.entity.Task.Companion.HIDE_UNTIL +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 diff --git a/app/src/androidTest/java/com/todoroo/astrid/service/TaskDeleterTest.kt b/app/src/androidTest/java/com/todoroo/astrid/service/TaskDeleterTest.kt index 6a0021c8e..7fcb6dc1a 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/service/TaskDeleterTest.kt +++ b/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 diff --git a/app/src/androidTest/java/com/todoroo/astrid/service/TaskMoverTest.kt b/app/src/androidTest/java/com/todoroo/astrid/service/TaskMoverTest.kt index 3087cf993..04e31dc6f 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/service/TaskMoverTest.kt +++ b/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.CaldavAccount.Companion.TYPE_CALDAV -import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavDao -import org.tasks.data.GoogleTaskDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_CALDAV +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.GoogleTaskDao import org.tasks.injection.InjectingTestCase import org.tasks.injection.ProductionModule import org.tasks.jobs.WorkManager diff --git a/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.kt b/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.kt index 6035ade94..0edc9e291 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.kt +++ b/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 diff --git a/app/src/androidTest/java/com/todoroo/astrid/service/Upgrade_11_3_Test.kt b/app/src/androidTest/java/com/todoroo/astrid/service/Upgrade_11_3_Test.kt index 7cc3ec61b..abb221190 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/service/Upgrade_11_3_Test.kt +++ b/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.CaldavDao -import org.tasks.data.TaskDao +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.TaskDao import org.tasks.injection.InjectingTestCase import org.tasks.injection.ProductionModule import org.tasks.makers.CaldavCalendarMaker.newCaldavCalendar diff --git a/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.kt b/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.kt index cab5d0fd5..a11f8f443 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.kt +++ b/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) diff --git a/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.kt b/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.kt index 9555f3867..fd56a39f9 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.kt +++ b/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) diff --git a/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.kt b/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.kt index 6a0aef0b9..52a39fb50 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.kt +++ b/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 diff --git a/app/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.kt b/app/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.kt index 81839a18c..576e6acf8 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.kt +++ b/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.TagData -import org.tasks.data.TagDataDao +import org.tasks.data.entity.Task +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao import org.tasks.injection.InjectingTestCase import javax.inject.Inject diff --git a/app/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.kt b/app/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.kt index 92288a17e..7a6e781b4 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/caldav/CaldavSynchronizerTest.kt b/app/src/androidTest/java/org/tasks/caldav/CaldavSynchronizerTest.kt index 2948db2e7..717c9b5d3 100644 --- a/app/src/androidTest/java/org/tasks/caldav/CaldavSynchronizerTest.kt +++ b/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.CaldavCalendar +import org.tasks.data.entity.CaldavAccount +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( - account = this@CaldavSynchronizerTest.account.uuid, - ctag = "http://sabre.io/ns/sync/1", - url = "${this@CaldavSynchronizerTest.account.url}test-shared/", - )) + caldavDao.insert( + CaldavCalendar( + account = this@CaldavSynchronizerTest.account.uuid, + ctag = "http://sabre.io/ns/sync/1", + url = "${this@CaldavSynchronizerTest.account.url}test-shared/", + ) + ) enqueue(OC_SHARE_PROPFIND) sync() diff --git a/app/src/androidTest/java/org/tasks/caldav/CaldavTest.kt b/app/src/androidTest/java/org/tasks/caldav/CaldavTest.kt index 13beebe4d..383f5ecd9 100644 --- a/app/src/androidTest/java/org/tasks/caldav/CaldavTest.kt +++ b/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.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.dao.CaldavDao import org.tasks.injection.InjectingTestCase import org.tasks.preferences.Preferences import org.tasks.security.KeyStoreEncryption diff --git a/app/src/androidTest/java/org/tasks/caldav/ServerDetectionTest.kt b/app/src/androidTest/java/org/tasks/caldav/ServerDetectionTest.kt index bfd74ac68..3be3dc29d 100644 --- a/app/src/androidTest/java/org/tasks/caldav/ServerDetectionTest.kt +++ b/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.CaldavAccount.Companion.SERVER_OPEN_XCHANGE -import org.tasks.data.CaldavAccount.Companion.SERVER_OWNCLOUD -import org.tasks.data.CaldavAccount.Companion.SERVER_SABREDAV -import org.tasks.data.CaldavAccount.Companion.SERVER_TASKS -import org.tasks.data.CaldavAccount.Companion.SERVER_UNKNOWN -import org.tasks.data.CaldavAccount.Companion.TYPE_CALDAV -import org.tasks.data.CaldavAccount.Companion.TYPE_TASKS +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_OPEN_XCHANGE +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_OWNCLOUD +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_SABREDAV +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_TASKS +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_UNKNOWN +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_CALDAV +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_TASKS import org.tasks.injection.ProductionModule @UninstallModules(ProductionModule::class) diff --git a/app/src/androidTest/java/org/tasks/caldav/SharingMailboxDotOrgTest.kt b/app/src/androidTest/java/org/tasks/caldav/SharingMailboxDotOrgTest.kt index 9f468f8f6..c84eaf614 100644 --- a/app/src/androidTest/java/org/tasks/caldav/SharingMailboxDotOrgTest.kt +++ b/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.CaldavCalendar -import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_WRITE -import org.tasks.data.PrincipalDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_WRITE +import org.tasks.data.dao.PrincipalDao import org.tasks.injection.ProductionModule import javax.inject.Inject diff --git a/app/src/androidTest/java/org/tasks/caldav/SharingOwncloudTest.kt b/app/src/androidTest/java/org/tasks/caldav/SharingOwncloudTest.kt index 7aa8e5c31..7862507e9 100644 --- a/app/src/androidTest/java/org/tasks/caldav/SharingOwncloudTest.kt +++ b/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.CaldavCalendar -import org.tasks.data.CaldavCalendar.Companion.ACCESS_OWNER -import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_ONLY -import org.tasks.data.PrincipalDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_OWNER +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_ONLY +import org.tasks.data.dao.PrincipalDao import org.tasks.injection.ProductionModule import javax.inject.Inject diff --git a/app/src/androidTest/java/org/tasks/caldav/SharingSabredavTest.kt b/app/src/androidTest/java/org/tasks/caldav/SharingSabredavTest.kt index 93bb660b2..d5473f635 100644 --- a/app/src/androidTest/java/org/tasks/caldav/SharingSabredavTest.kt +++ b/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.CaldavCalendar -import org.tasks.data.CaldavCalendar.Companion.ACCESS_OWNER -import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_WRITE -import org.tasks.data.CaldavCalendar.Companion.INVITE_ACCEPTED -import org.tasks.data.PrincipalDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_OWNER +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_WRITE +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_ACCEPTED +import org.tasks.data.dao.PrincipalDao import org.tasks.injection.ProductionModule import javax.inject.Inject diff --git a/app/src/androidTest/java/org/tasks/data/CaldavDaoShiftTests.kt b/app/src/androidTest/java/org/tasks/data/CaldavDaoShiftTests.kt index c46601b07..15c56e0ab 100644 --- a/app/src/androidTest/java/org/tasks/data/CaldavDaoShiftTests.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/data/CaldavDaoTests.kt b/app/src/androidTest/java/org/tasks/data/CaldavDaoTests.kt index a55baf2f5..d4b145522 100644 --- a/app/src/androidTest/java/org/tasks/data/CaldavDaoTests.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/data/DeletionDaoTests.kt b/app/src/androidTest/java/org/tasks/data/DeletionDaoTests.kt index a0568a924..b8a322db2 100644 --- a/app/src/androidTest/java/org/tasks/data/DeletionDaoTests.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/data/GoogleTaskDaoTests.kt b/app/src/androidTest/java/org/tasks/data/GoogleTaskDaoTests.kt index 706c6fcc3..b15a84cf4 100644 --- a/app/src/androidTest/java/org/tasks/data/GoogleTaskDaoTests.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/data/GoogleTaskListDaoTest.kt b/app/src/androidTest/java/org/tasks/data/GoogleTaskListDaoTest.kt index 4f0934d32..090e6bd13 100644 --- a/app/src/androidTest/java/org/tasks/data/GoogleTaskListDaoTest.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/data/LocationDaoTest.kt b/app/src/androidTest/java/org/tasks/data/LocationDaoTest.kt index 91ac7e771..3d9d4f40e 100644 --- a/app/src/androidTest/java/org/tasks/data/LocationDaoTest.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/data/ManualGoogleTaskQueryTest.kt b/app/src/androidTest/java/org/tasks/data/ManualGoogleTaskQueryTest.kt index 5c9193f16..8ebb871b2 100644 --- a/app/src/androidTest/java/org/tasks/data/ManualGoogleTaskQueryTest.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/data/TagDataDaoTest.kt b/app/src/androidTest/java/org/tasks/data/TagDataDaoTest.kt index 5f4467bf2..ea30d75ff 100644 --- a/app/src/androidTest/java/org/tasks/data/TagDataDaoTest.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/data/TaskDaoTests.kt b/app/src/androidTest/java/org/tasks/data/TaskDaoTests.kt index f3b1aca72..c412baf4c 100644 --- a/app/src/androidTest/java/org/tasks/data/TaskDaoTests.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/data/UpgraderDaoTests.kt b/app/src/androidTest/java/org/tasks/data/UpgraderDaoTests.kt index eb09a0986..4fe7bdd06 100644 --- a/app/src/androidTest/java/org/tasks/data/UpgraderDaoTests.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/gtasks/GoogleTaskSynchronizerTest.kt b/app/src/androidTest/java/org/tasks/gtasks/GoogleTaskSynchronizerTest.kt index d3430cdc4..8095643ba 100644 --- a/app/src/androidTest/java/org/tasks/gtasks/GoogleTaskSynchronizerTest.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/injection/TestModule.kt b/app/src/androidTest/java/org/tasks/injection/TestModule.kt index 36565e09a..d1f87fa47 100644 --- a/app/src/androidTest/java/org/tasks/injection/TestModule.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.kt b/app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.kt index ac44c4b3a..f1baf3190 100644 --- a/app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/opentasks/OpenTasksDueDateTests.kt b/app/src/androidTest/java/org/tasks/opentasks/OpenTasksDueDateTests.kt index 250c0c31c..91ed66bfe 100644 --- a/app/src/androidTest/java/org/tasks/opentasks/OpenTasksDueDateTests.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/opentasks/OpenTasksPropertiesTests.kt b/app/src/androidTest/java/org/tasks/opentasks/OpenTasksPropertiesTests.kt index d8a8e6926..7b9b61945 100644 --- a/app/src/androidTest/java/org/tasks/opentasks/OpenTasksPropertiesTests.kt +++ b/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.Alarm.Companion.TYPE_SNOOZE -import org.tasks.data.AlarmDao -import org.tasks.data.TagDao -import org.tasks.data.TagDataDao +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE +import org.tasks.data.dao.AlarmDao +import org.tasks.data.dao.TagDao +import org.tasks.data.dao.TagDataDao import org.tasks.injection.ProductionModule import org.tasks.makers.CaldavTaskMaker import org.tasks.makers.CaldavTaskMaker.CALENDAR diff --git a/app/src/androidTest/java/org/tasks/opentasks/OpenTasksSynchronizerTest.kt b/app/src/androidTest/java/org/tasks/opentasks/OpenTasksSynchronizerTest.kt index 3e6615a7a..b41030f2a 100644 --- a/app/src/androidTest/java/org/tasks/opentasks/OpenTasksSynchronizerTest.kt +++ b/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.CaldavAccount.Companion.TYPE_OPENTASKS -import org.tasks.data.CaldavCalendar +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_OPENTASKS +import org.tasks.data.entity.CaldavCalendar import org.tasks.injection.ProductionModule import org.tasks.makers.CaldavTaskMaker.CALENDAR import org.tasks.makers.CaldavTaskMaker.REMOTE_ID diff --git a/app/src/androidTest/java/org/tasks/opentasks/OpenTasksTest.kt b/app/src/androidTest/java/org/tasks/opentasks/OpenTasksTest.kt index a8ebb8a27..c08f33e39 100644 --- a/app/src/androidTest/java/org/tasks/opentasks/OpenTasksTest.kt +++ b/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.CaldavDao +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao import org.tasks.injection.InjectingTestCase import org.tasks.preferences.Preferences import javax.inject.Inject diff --git a/app/src/androidTest/java/org/tasks/opentasks/TestOpenTaskDao.kt b/app/src/androidTest/java/org/tasks/opentasks/TestOpenTaskDao.kt index f4491eb0a..a3d5f6695 100644 --- a/app/src/androidTest/java/org/tasks/opentasks/TestOpenTaskDao.kt +++ b/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.CaldavDao +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao import org.tasks.data.MyAndroidTask import org.tasks.data.OpenTaskDao import javax.inject.Inject diff --git a/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.kt b/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.kt index 00988fbaf..b393109f6 100644 --- a/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.kt +++ b/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 com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_DEADLINE -import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_START +import org.tasks.data.entity.Task.Companion.NOTIFY_AFTER_DEADLINE +import org.tasks.data.entity.Task.Companion.NOTIFY_AT_DEADLINE +import org.tasks.data.entity.Task.Companion.NOTIFY_AT_START import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test diff --git a/app/src/androidTest/java/org/tasks/ui/editviewmodel/BaseTaskEditViewModelTest.kt b/app/src/androidTest/java/org/tasks/ui/editviewmodel/BaseTaskEditViewModelTest.kt index cb5106cbc..97bfde019 100644 --- a/app/src/androidTest/java/org/tasks/ui/editviewmodel/BaseTaskEditViewModelTest.kt +++ b/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.LocationDao -import org.tasks.data.TagDataDao -import org.tasks.data.UserActivityDao +import org.tasks.data.dao.AlarmDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.dao.TagDataDao +import org.tasks.data.dao.UserActivityDao import org.tasks.data.getLocation import org.tasks.injection.InjectingTestCase import org.tasks.location.GeofenceApi diff --git a/app/src/androidTest/java/org/tasks/ui/editviewmodel/PriorityTests.kt b/app/src/androidTest/java/org/tasks/ui/editviewmodel/PriorityTests.kt index 1ed6a4fbe..3f2894f42 100644 --- a/app/src/androidTest/java/org/tasks/ui/editviewmodel/PriorityTests.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt b/app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt index 0a62c457a..be70ab0a3 100644 --- a/app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt +++ b/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.Alarm.Companion.whenOverdue +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.whenOverdue import org.tasks.data.createDueDate import org.tasks.injection.ProductionModule import org.tasks.makers.TaskMaker.newTask diff --git a/app/src/androidTest/java/org/tasks/ui/editviewmodel/TaskEditViewModelTest.kt b/app/src/androidTest/java/org/tasks/ui/editviewmodel/TaskEditViewModelTest.kt index 39fbc6f50..c5006b49e 100644 --- a/app/src/androidTest/java/org/tasks/ui/editviewmodel/TaskEditViewModelTest.kt +++ b/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 diff --git a/app/src/androidTest/java/org/tasks/ui/editviewmodel/TaskListViewModelTest.kt b/app/src/androidTest/java/org/tasks/ui/editviewmodel/TaskListViewModelTest.kt index f5af9b2c5..e30a5bfc8 100644 --- a/app/src/androidTest/java/org/tasks/ui/editviewmodel/TaskListViewModelTest.kt +++ b/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.TaskDao +import org.tasks.data.dao.DeletionDao +import org.tasks.data.dao.TaskDao import org.tasks.injection.InjectingTestCase import org.tasks.injection.ProductionModule import org.tasks.preferences.Preferences diff --git a/app/src/androidTest/java/org/tasks/ui/editviewmodel/TitleTests.kt b/app/src/androidTest/java/org/tasks/ui/editviewmodel/TitleTests.kt index 51b963bde..6a66da9bb 100644 --- a/app/src/androidTest/java/org/tasks/ui/editviewmodel/TitleTests.kt +++ b/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 diff --git a/app/src/androidTestGoogleplay/java/org/tasks/billing/InventoryTest.kt b/app/src/androidTestGoogleplay/java/org/tasks/billing/InventoryTest.kt index 8369d53a9..c5d0158eb 100644 --- a/app/src/androidTestGoogleplay/java/org/tasks/billing/InventoryTest.kt +++ b/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 diff --git a/app/src/androidTestGoogleplay/java/org/tasks/caldav/CaldavSubscriptionTest.kt b/app/src/androidTestGoogleplay/java/org/tasks/caldav/CaldavSubscriptionTest.kt index 842ea2f45..96a6dd7f1 100644 --- a/app/src/androidTestGoogleplay/java/org/tasks/caldav/CaldavSubscriptionTest.kt +++ b/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 diff --git a/app/src/debug/java/org/tasks/FlipperHttpInterceptor.kt b/app/src/debug/java/org/tasks/FlipperHttpInterceptor.kt index 55f6edc21..a4dbb22d9 100644 --- a/app/src/debug/java/org/tasks/FlipperHttpInterceptor.kt +++ b/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 diff --git a/app/src/googleplay/java/org/tasks/location/GoogleGeofenceTransitionIntentService.kt b/app/src/googleplay/java/org/tasks/location/GoogleGeofenceTransitionIntentService.kt index 826d4752e..dfe271dc1 100644 --- a/app/src/googleplay/java/org/tasks/location/GoogleGeofenceTransitionIntentService.kt +++ b/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 diff --git a/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt b/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt index a51e6a42d..64812246f 100644 --- a/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt +++ b/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 diff --git a/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt b/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt index 2af7f55f2..a8ab11bfc 100644 --- a/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt +++ b/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 diff --git a/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java index b3179d84c..d75569437 100644 --- a/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java +++ b/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; diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt index 3b5d530b1..d68d0f801 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt +++ b/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.LocationDao -import org.tasks.data.Place -import org.tasks.data.TagDataDao -import com.todoroo.astrid.data.Task +import org.tasks.data.dao.AlarmDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Place +import org.tasks.data.dao.TagDataDao +import org.tasks.data.entity.Task import org.tasks.data.getLocation import org.tasks.databinding.TaskListActivityBinding import org.tasks.dialogs.NewFilterDialog diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt b/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt index 99aecfa5b..4f06bdf65 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt +++ b/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.TaskDao +import org.tasks.data.entity.Task +import org.tasks.data.dao.TaskDao import org.tasks.data.count import org.tasks.filters.FilterProvider import org.tasks.filters.NavigationDrawerSubheader diff --git a/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.kt b/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.kt index f8f3e40ba..252ae2ae3 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.kt +++ b/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 diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt index d3c2da320..1e6573f87 100755 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt +++ b/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.UserActivityDao +import org.tasks.data.entity.TagData +import org.tasks.data.dao.UserActivityDao import org.tasks.databinding.FragmentTaskEditBinding import org.tasks.databinding.TaskEditCalendarBinding import org.tasks.databinding.TaskEditFilesBinding diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt index 6a701bb1c..7fd274af5 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt +++ b/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 com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Join +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 com.todoroo.astrid.dao.Database -import org.tasks.data.Tag -import org.tasks.data.TagDataDao -import com.todoroo.astrid.data.Task +import org.tasks.data.dao.CaldavDao +import org.tasks.data.db.Database +import org.tasks.data.entity.Tag +import org.tasks.data.dao.TagDataDao +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 diff --git a/app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.kt index 5421f02dd..aea24b2ae 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/AstridTaskAdapter.kt +++ b/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.GoogleTaskDao +import org.tasks.data.dao.CaldavDao +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 diff --git a/app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt index 90868eea7..32c82a975 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapter.kt +++ b/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.GoogleTaskDao +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.GoogleTaskDao class CaldavManualSortTaskAdapter internal constructor( - googleTaskDao: GoogleTaskDao, - caldavDao: CaldavDao, - taskDao: TaskDao, - localBroadcastManager: LocalBroadcastManager, - taskMover: TaskMover, + googleTaskDao: GoogleTaskDao, + caldavDao: CaldavDao, + taskDao: TaskDao, + localBroadcastManager: LocalBroadcastManager, + taskMover: TaskMover, ) : TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager, taskMover) { override suspend fun moved(from: Int, to: Int, indent: Int) { diff --git a/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapter.kt index fa2ff626e..6aa802c9a 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapter.kt +++ b/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.GoogleTaskDao +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.GoogleTaskDao class GoogleTaskManualSortAdapter internal constructor( - googleTaskDao: GoogleTaskDao, - caldavDao: CaldavDao, - taskDao: TaskDao, - localBroadcastManager: LocalBroadcastManager, - taskMover: TaskMover, + googleTaskDao: GoogleTaskDao, + caldavDao: CaldavDao, + taskDao: TaskDao, + localBroadcastManager: LocalBroadcastManager, + taskMover: TaskMover, ) : TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager, taskMover) { override suspend fun moved(from: Int, to: Int, indent: Int) { diff --git a/app/src/main/java/com/todoroo/astrid/adapter/SubheaderClickHandler.kt b/app/src/main/java/com/todoroo/astrid/adapter/SubheaderClickHandler.kt index 1eb60470c..f380f1b56 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/SubheaderClickHandler.kt +++ b/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 diff --git a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt index dfd1f16ab..60ad044ac 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt +++ b/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.CaldavDao.Companion.toAppleEpoch -import org.tasks.data.CaldavTask -import org.tasks.data.GoogleTaskDao -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL_SPECIFIC_DAY +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.CaldavDao.Companion.toAppleEpoch +import org.tasks.data.entity.CaldavTask +import org.tasks.data.dao.GoogleTaskDao +import org.tasks.data.entity.Task +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 googleTaskDao: GoogleTaskDao, - private val caldavDao: CaldavDao, - private val taskDao: TaskDao, - private val localBroadcastManager: LocalBroadcastManager, - private val taskMover: TaskMover, + private val newTasksOnTop: Boolean, + private val googleTaskDao: GoogleTaskDao, + private val caldavDao: CaldavDao, + private val taskDao: TaskDao, + private val localBroadcastManager: LocalBroadcastManager, + private val taskMover: TaskMover, ) { private val selected = HashSet() private lateinit var dataSource: TaskAdapterDataSource diff --git a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapterProvider.kt b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapterProvider.kt index 8990ef077..f30cf4435 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapterProvider.kt +++ b/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.GoogleTaskDao -import org.tasks.data.TaskListMetadata -import org.tasks.data.TaskListMetadataDao +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.GoogleTaskDao +import org.tasks.data.entity.TaskListMetadata +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, - private val preferences: Preferences, - private val taskListMetadataDao: TaskListMetadataDao, - private val taskDao: TaskDao, - private val googleTaskDao: GoogleTaskDao, - private val caldavDao: CaldavDao, - private val localBroadcastManager: LocalBroadcastManager, - private val taskMover: TaskMover, + @param:ApplicationContext private val context: Context, + private val preferences: Preferences, + private val taskListMetadataDao: TaskListMetadataDao, + private val taskDao: TaskDao, + private val googleTaskDao: GoogleTaskDao, + private val caldavDao: CaldavDao, + private val localBroadcastManager: LocalBroadcastManager, + private val taskMover: TaskMover, ) { fun createTaskAdapter(filter: Filter): TaskAdapter { if (filter is AstridOrderingFilter && preferences.isAstridSort) { diff --git a/app/src/main/java/com/todoroo/astrid/alarms/AlarmCalculator.kt b/app/src/main/java/com/todoroo/astrid/alarms/AlarmCalculator.kt index f94f63b6a..875bd2f4a 100644 --- a/app/src/main/java/com/todoroo/astrid/alarms/AlarmCalculator.kt +++ b/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.Alarm +import org.tasks.data.entity.Task +import org.tasks.data.entity.Alarm import org.tasks.jobs.AlarmEntry import org.tasks.preferences.Preferences import org.tasks.reminders.Random diff --git a/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt b/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt index 845f01e14..3a326de50 100644 --- a/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt +++ b/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.Alarm.Companion.TYPE_SNOOZE -import org.tasks.data.AlarmDao -import org.tasks.data.TaskDao +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE +import org.tasks.data.dao.AlarmDao +import org.tasks.data.dao.TaskDao import org.tasks.jobs.AlarmEntry import org.tasks.jobs.WorkManager import org.tasks.notifications.NotificationManager diff --git a/app/src/main/java/com/todoroo/astrid/api/CaldavFilter.kt b/app/src/main/java/com/todoroo/astrid/api/CaldavFilter.kt index 66e2b7c9f..179924191 100644 --- a/app/src/main/java/com/todoroo/astrid/api/CaldavFilter.kt +++ b/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 com.todoroo.andlib.sql.Join.Companion.left -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Criterion.Companion.and +import org.tasks.data.sql.Join.Companion.left +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.CaldavTask +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.entity.CaldavTask import org.tasks.data.NO_COUNT -import com.todoroo.astrid.data.Task -import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible +import org.tasks.data.entity.Task +import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible @Parcelize data class CaldavFilter( diff --git a/app/src/main/java/com/todoroo/astrid/api/CustomFilter.kt b/app/src/main/java/com/todoroo/astrid/api/CustomFilter.kt index 58e1bff45..ef865cd21 100644 --- a/app/src/main/java/com/todoroo/astrid/api/CustomFilter.kt +++ b/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 diff --git a/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.kt b/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.kt index 20c73b757..8c99e9239 100644 --- a/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.kt +++ b/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 com.todoroo.andlib.sql.Join.Companion.left -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Criterion.Companion.and +import org.tasks.data.sql.Join.Companion.left +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.CaldavTask +import org.tasks.data.entity.CaldavCalendar +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( diff --git a/app/src/main/java/com/todoroo/astrid/api/SearchFilter.kt b/app/src/main/java/com/todoroo/astrid/api/SearchFilter.kt index fdc12928a..37e99349b 100644 --- a/app/src/main/java/com/todoroo/astrid/api/SearchFilter.kt +++ b/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 com.todoroo.andlib.sql.Join -import com.todoroo.andlib.sql.Query -import com.todoroo.andlib.sql.QueryTemplate -import com.todoroo.astrid.data.Task +import org.tasks.data.sql.Criterion +import org.tasks.data.sql.Join +import org.tasks.data.sql.Query +import org.tasks.data.sql.QueryTemplate +import org.tasks.data.entity.Task import kotlinx.parcelize.Parcelize -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavTask -import org.tasks.data.Geofence -import org.tasks.data.Place -import org.tasks.data.Tag -import org.tasks.data.UserActivity +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.entity.CaldavTask +import org.tasks.data.entity.Geofence +import org.tasks.data.entity.Place +import org.tasks.data.entity.Tag +import org.tasks.data.entity.UserActivity @Parcelize data class SearchFilter( diff --git a/app/src/main/java/com/todoroo/astrid/api/TagFilter.kt b/app/src/main/java/com/todoroo/astrid/api/TagFilter.kt index 1b1904015..179d3a7fc 100644 --- a/app/src/main/java/com/todoroo/astrid/api/TagFilter.kt +++ b/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 com.todoroo.andlib.sql.Join.Companion.inner -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Criterion.Companion.and +import org.tasks.data.sql.Join.Companion.inner +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.TagData -import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible +import org.tasks.data.entity.Tag +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible @Parcelize data class TagFilter( diff --git a/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.kt b/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.kt index 6b83fe797..c37aa6f92 100644 --- a/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.kt +++ b/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 com.todoroo.andlib.sql.Criterion.Companion.or -import com.todoroo.andlib.sql.Join -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Criterion.Companion.and +import org.tasks.data.sql.Criterion.Companion.or +import org.tasks.data.sql.Join +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.CaldavCalendar -import org.tasks.data.CaldavTask -import org.tasks.data.TaskDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.entity.CaldavTask +import org.tasks.data.dao.TaskDao import org.tasks.filters.MyTasksFilter import org.tasks.filters.NotificationsFilter import org.tasks.filters.RecentlyModifiedFilter diff --git a/app/src/main/java/com/todoroo/astrid/core/CriterionInstance.kt b/app/src/main/java/com/todoroo/astrid/core/CriterionInstance.kt index 6dbec8844..675a1b2a3 100644 --- a/app/src/main/java/com/todoroo/astrid/core/CriterionInstance.kt +++ b/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 diff --git a/app/src/main/java/com/todoroo/astrid/core/SortHelper.java b/app/src/main/java/com/todoroo/astrid/core/SortHelper.java index 2d1683f00..4812335df 100644 --- a/app/src/main/java/com/todoroo/astrid/core/SortHelper.java +++ b/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 com.todoroo.andlib.sql.Order; -import com.todoroo.andlib.sql.OrderType; -import com.todoroo.astrid.data.Task; +import org.tasks.data.sql.Functions; +import org.tasks.data.sql.Order; +import org.tasks.data.sql.OrderType; +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; diff --git a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt index 22848b869..c0f1ca502 100644 --- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt +++ b/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 localBroadcastManager: LocalBroadcastManager, - private val notificationManager: NotificationManager, - private val geofenceApi: GeofenceApi, - private val timerPlugin: TimerPlugin, - private val syncAdapters: SyncAdapters, - private val workManager: WorkManager, + private val taskDao: TaskDao, + private val localBroadcastManager: LocalBroadcastManager, + private val notificationManager: NotificationManager, + private val geofenceApi: GeofenceApi, + private val timerPlugin: TimerPlugin, + private val syncAdapters: SyncAdapters, + private val workManager: WorkManager, ) { suspend fun fetch(id: Long): Task? = taskDao.fetch(id) diff --git a/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.kt b/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.kt index ab59ab1df..c551afc02 100644 --- a/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.kt +++ b/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.TaskAttachmentDao +import org.tasks.data.entity.TaskAttachment +import org.tasks.data.dao.TaskAttachmentDao import org.tasks.dialogs.AddAttachmentDialog import org.tasks.files.FileHelper import org.tasks.preferences.Preferences diff --git a/app/src/main/java/com/todoroo/astrid/gcal/GCalHelper.kt b/app/src/main/java/com/todoroo/astrid/gcal/GCalHelper.kt index 8c31cfdcd..42cb1ad40 100644 --- a/app/src/main/java/com/todoroo/astrid/gcal/GCalHelper.kt +++ b/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, - private val taskDao: TaskDao, - private val preferences: Preferences, - private val permissionChecker: PermissionChecker, - private val calendarEventProvider: CalendarEventProvider) { + @ApplicationContext private val context: Context, + private val taskDao: TaskDao, + private val preferences: Preferences, + private val permissionChecker: PermissionChecker, + private val calendarEventProvider: CalendarEventProvider) { private val cr: ContentResolver = context.contentResolver diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.kt b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.kt index 1a8260104..43221456e 100644 --- a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.kt +++ b/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.CaldavCalendar -import org.tasks.data.GoogleTaskListDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.GoogleTaskListDao import javax.inject.Inject class GtasksListService @Inject constructor( - private val googleTaskListDao: GoogleTaskListDao, - private val taskDeleter: TaskDeleter, - private val localBroadcastManager: LocalBroadcastManager, + private val googleTaskListDao: GoogleTaskListDao, + private val taskDeleter: TaskDeleter, + private val localBroadcastManager: LocalBroadcastManager, ) { /** diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.kt b/app/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.kt index f42b800a0..25a97a0fb 100644 --- a/app/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.kt +++ b/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.CaldavAccount.Companion.TYPE_GOOGLE_TASKS -import org.tasks.data.CaldavDao -import org.tasks.data.GoogleTaskListDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.GoogleTaskListDao import org.tasks.dialogs.DialogBuilder import org.tasks.gtasks.GoogleAccountManager import org.tasks.preferences.ActivityPermissionRequestor diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt index ec63bfbfe..e907ed04a 100644 --- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt +++ b/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.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.dao.CaldavDao import org.tasks.repeats.BasicRecurrenceDialog import org.tasks.repeats.RecurrenceUtils.newRecur import org.tasks.repeats.RepeatRuleToString diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt b/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt index 1553c4c64..952ec1353 100644 --- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt +++ b/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.Alarm.Companion.TYPE_SNOOZE +import org.tasks.data.entity.Alarm +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 diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt b/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt index 5faf93d8e..684daafbe 100644 --- a/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt +++ b/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 diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskCreator.kt b/app/src/main/java/com/todoroo/astrid/service/TaskCreator.kt index 9436f9040..cb0fb0b31 100644 --- a/app/src/main/java/com/todoroo/astrid/service/TaskCreator.kt +++ b/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 com.todoroo.astrid.data.Task.Companion.DUE_DATE -import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL -import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL_NONE -import com.todoroo.astrid.data.Task.Companion.IMPORTANCE +import org.tasks.data.entity.Task +import org.tasks.data.entity.Task.Companion.DUE_DATE +import org.tasks.data.entity.Task.Companion.HIDE_UNTIL +import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_NONE +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.Alarm.Companion.TYPE_RANDOM -import org.tasks.data.Alarm.Companion.whenDue -import org.tasks.data.Alarm.Companion.whenOverdue -import org.tasks.data.Alarm.Companion.whenStarted -import org.tasks.data.AlarmDao -import org.tasks.data.CaldavDao -import org.tasks.data.CaldavTask +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_RANDOM +import org.tasks.data.entity.Alarm.Companion.whenDue +import org.tasks.data.entity.Alarm.Companion.whenOverdue +import org.tasks.data.entity.Alarm.Companion.whenStarted +import org.tasks.data.dao.AlarmDao +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask import org.tasks.data.GoogleTask -import org.tasks.data.GoogleTaskDao -import org.tasks.data.LocationDao -import org.tasks.data.Place -import org.tasks.data.Tag -import org.tasks.data.TagDao -import org.tasks.data.TagData -import org.tasks.data.TagDataDao +import org.tasks.data.dao.GoogleTaskDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Place +import org.tasks.data.entity.Tag +import org.tasks.data.dao.TagDao +import org.tasks.data.entity.TagData +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 preferences: Preferences, - private val tagDataDao: TagDataDao, - private val taskDao: TaskDao, - private val tagDao: TagDao, - private val googleTaskDao: GoogleTaskDao, - private val defaultFilterProvider: DefaultFilterProvider, - private val caldavDao: CaldavDao, - private val locationDao: LocationDao, - private val alarmDao: AlarmDao, + private val gcalHelper: GCalHelper, + private val preferences: Preferences, + private val tagDataDao: TagDataDao, + private val taskDao: TaskDao, + private val tagDao: TagDao, + private val googleTaskDao: GoogleTaskDao, + private val defaultFilterProvider: DefaultFilterProvider, + private val caldavDao: CaldavDao, + private val locationDao: LocationDao, + private val alarmDao: AlarmDao, ) { suspend fun basicQuickAddTask(title: String): Task { diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.kt b/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.kt index 3281e0544..b61ab42c2 100644 --- a/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.kt +++ b/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 com.todoroo.astrid.data.Task +import org.tasks.data.db.Database +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.CaldavCalendar -import org.tasks.data.DeletionDao -import org.tasks.data.LocationDao -import org.tasks.data.TaskDao -import org.tasks.data.UserActivityDao -import org.tasks.db.SuspendDbUtils.chunkedMap +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.DeletionDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.dao.TaskDao +import org.tasks.data.dao.UserActivityDao +import org.tasks.data.db.SuspendDbUtils.chunkedMap import org.tasks.files.FileHelper import org.tasks.location.GeofenceApi import org.tasks.notifications.NotificationManager diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt b/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt index e5bed120a..40f5db41a 100644 --- a/app/src/main/java/com/todoroo/astrid/service/TaskDuplicator.kt +++ b/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 com.todoroo.astrid.data.Task.Companion.NO_ID +import org.tasks.data.entity.Task +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.AlarmDao -import org.tasks.data.Attachment -import org.tasks.data.CaldavDao -import org.tasks.data.CaldavTask -import org.tasks.data.Geofence -import org.tasks.data.GoogleTaskDao -import org.tasks.data.LocationDao -import org.tasks.data.Tag -import org.tasks.data.TagDao -import org.tasks.data.TagDataDao -import org.tasks.data.TaskAttachmentDao -import org.tasks.db.DbUtils.dbchunk +import org.tasks.data.entity.Alarm +import org.tasks.data.dao.AlarmDao +import org.tasks.data.entity.Attachment +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask +import org.tasks.data.entity.Geofence +import org.tasks.data.dao.GoogleTaskDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Tag +import org.tasks.data.dao.TagDao +import org.tasks.data.dao.TagDataDao +import org.tasks.data.dao.TaskAttachmentDao +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 taskDao: TaskDao, - private val localBroadcastManager: LocalBroadcastManager, - private val tagDao: TagDao, - private val tagDataDao: TagDataDao, - private val googleTaskDao: GoogleTaskDao, - private val caldavDao: CaldavDao, - private val locationDao: LocationDao, - private val alarmDao: AlarmDao, - private val preferences: Preferences, - private val taskAttachmentDao: TaskAttachmentDao, + private val gcalHelper: GCalHelper, + private val taskDao: TaskDao, + private val localBroadcastManager: LocalBroadcastManager, + private val tagDao: TagDao, + private val tagDataDao: TagDataDao, + private val googleTaskDao: GoogleTaskDao, + private val caldavDao: CaldavDao, + private val locationDao: LocationDao, + private val alarmDao: AlarmDao, + private val preferences: Preferences, + private val taskAttachmentDao: TaskAttachmentDao, ) { suspend fun duplicate(taskIds: List): List { @@ -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()) { diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskMover.kt b/app/src/main/java/com/todoroo/astrid/service/TaskMover.kt index 96446c862..31377ddc2 100644 --- a/app/src/main/java/com/todoroo/astrid/service/TaskMover.kt +++ b/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.CaldavDao -import org.tasks.data.CaldavTask -import org.tasks.data.GoogleTaskDao -import org.tasks.data.GoogleTaskListDao -import com.todoroo.astrid.data.Task -import org.tasks.data.TaskDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask +import org.tasks.data.dao.GoogleTaskDao +import org.tasks.data.dao.GoogleTaskListDao +import org.tasks.data.entity.Task +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, - private val taskDao: TaskDao, - private val caldavDao: CaldavDao, - private val googleTaskDao: GoogleTaskDao, - private val googleTaskListDao: GoogleTaskListDao, - private val preferences: Preferences, - private val localBroadcastManager: LocalBroadcastManager, - private val syncAdapters: SyncAdapters, - private val vtodoCache: VtodoCache, + @param:ApplicationContext private val context: Context, + private val taskDao: TaskDao, + private val caldavDao: CaldavDao, + private val googleTaskDao: GoogleTaskDao, + private val googleTaskListDao: GoogleTaskListDao, + private val preferences: Preferences, + private val localBroadcastManager: LocalBroadcastManager, + private val syncAdapters: SyncAdapters, + private val vtodoCache: VtodoCache, ) { suspend fun getSingleFilter(tasks: List): Filter? { diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrade_11_12_3.kt b/app/src/main/java/com/todoroo/astrid/service/Upgrade_11_12_3.kt index 687ffcb41..60df8b7c4 100644 --- a/app/src/main/java/com/todoroo/astrid/service/Upgrade_11_12_3.kt +++ b/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 com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_DEADLINE +import org.tasks.data.entity.Task.Companion.NOTIFY_AFTER_DEADLINE +import org.tasks.data.entity.Task.Companion.NOTIFY_AT_DEADLINE import org.tasks.R import org.tasks.preferences.Preferences import javax.inject.Inject diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrade_11_3.kt b/app/src/main/java/com/todoroo/astrid/service/Upgrade_11_3.kt index d2fcdf903..c05b5cee0 100644 --- a/app/src/main/java/com/todoroo/astrid/service/Upgrade_11_3.kt +++ b/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.UpgraderDao +import org.tasks.data.dao.TaskDao +import org.tasks.data.dao.UpgraderDao import javax.inject.Inject class Upgrade_11_3 @Inject constructor( - private val upgraderDao: UpgraderDao, - private val openTaskDao: OpenTaskDao, - private val taskDao: TaskDao, - private val vtodoCache: VtodoCache, + private val upgraderDao: UpgraderDao, + private val openTaskDao: OpenTaskDao, + private val taskDao: TaskDao, + private val vtodoCache: VtodoCache, ) { internal suspend fun applyiCalendarStartDates() { val (hasStartDate, noStartDate) = diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrade_12_4.kt b/app/src/main/java/com/todoroo/astrid/service/Upgrade_12_4.kt index 52623e4c8..82598d51c 100644 --- a/app/src/main/java/com/todoroo/astrid/service/Upgrade_12_4.kt +++ b/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.UpgraderDao +import org.tasks.data.dao.TaskDao +import org.tasks.data.dao.UpgraderDao import javax.inject.Inject class Upgrade_12_4 @Inject constructor( diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrade_13_2.kt b/app/src/main/java/com/todoroo/astrid/service/Upgrade_13_2.kt index fc0241150..0d942fa26 100644 --- a/app/src/main/java/com/todoroo/astrid/service/Upgrade_13_2.kt +++ b/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 diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt b/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt index e7af3d5e5..125824be3 100644 --- a/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt +++ b/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.CaldavTask +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask import org.tasks.data.CaldavTaskContainer -import org.tasks.data.Filter -import org.tasks.data.FilterDao -import org.tasks.data.GoogleTaskListDao +import org.tasks.data.entity.Filter +import org.tasks.data.dao.FilterDao +import org.tasks.data.dao.GoogleTaskListDao import org.tasks.data.Location -import org.tasks.data.LocationDao -import org.tasks.data.Tag -import org.tasks.data.TagDao -import org.tasks.data.TagData -import org.tasks.data.TagDataDao -import org.tasks.data.TaskAttachmentDao -import org.tasks.data.UpgraderDao -import org.tasks.data.UserActivityDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Tag +import org.tasks.data.dao.TagDao +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao +import org.tasks.data.dao.TaskAttachmentDao +import org.tasks.data.dao.UpgraderDao +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, - private val preferences: Preferences, - private val tagDataDao: TagDataDao, - private val tagDao: TagDao, - private val filterDao: FilterDao, - private val defaultFilterProvider: DefaultFilterProvider, - private val googleTaskListDao: GoogleTaskListDao, - private val userActivityDao: UserActivityDao, - private val taskAttachmentDao: TaskAttachmentDao, - private val caldavDao: CaldavDao, - private val taskDao: TaskDao, - private val locationDao: LocationDao, - private val iCal: iCalendar, - private val widgetManager: AppWidgetManager, - private val taskMover: TaskMover, - private val upgraderDao: UpgraderDao, - private val vtodoCache: VtodoCache, - private val upgrade_11_3: Lazy, - private val upgrade_11_12_3: Lazy, - private val upgrade_12_4: Lazy, - private val upgrade_13_2: Lazy, + @param:ApplicationContext private val context: Context, + private val preferences: Preferences, + private val tagDataDao: TagDataDao, + private val tagDao: TagDao, + private val filterDao: FilterDao, + private val defaultFilterProvider: DefaultFilterProvider, + private val googleTaskListDao: GoogleTaskListDao, + private val userActivityDao: UserActivityDao, + private val taskAttachmentDao: TaskAttachmentDao, + private val caldavDao: CaldavDao, + private val taskDao: TaskDao, + private val locationDao: LocationDao, + private val iCal: iCalendar, + private val widgetManager: AppWidgetManager, + private val taskMover: TaskMover, + private val upgraderDao: UpgraderDao, + private val vtodoCache: VtodoCache, + private val upgrade_11_3: Lazy, + private val upgrade_11_12_3: Lazy, + private val upgrade_12_4: Lazy, + private val upgrade_13_2: Lazy, ) { fun upgrade(from: Int, to: Int) { diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.kt b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.kt index 7c8f43a48..0eada10e2 100644 --- a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.kt +++ b/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 com.todoroo.astrid.data.Task.Companion.isValidUuid +import org.tasks.data.entity.Task +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.TaskListMetadataDao +import org.tasks.data.entity.TaskListMetadata +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 taskDao: TaskDao + private val taskListMetadataDao: TaskListMetadataDao, + private val taskDao: TaskDao ) { private val idToNode = HashMap() private var treeRoot: Node? = null diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.kt b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.kt index cf6d6028e..0ee8073be 100644 --- a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.kt +++ b/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.TagDataDao -import org.tasks.data.TaskListMetadata -import org.tasks.data.TaskListMetadataDao +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao +import org.tasks.data.entity.TaskListMetadata +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, - private val taskDao: TaskDao, - private val tagDataDao: TagDataDao, - private val taskListMetadataDao: TaskListMetadataDao) { + @param:ApplicationContext private val context: Context, + private val taskDao: TaskDao, + private val tagDataDao: TagDataDao, + private val taskListMetadataDao: TaskListMetadataDao +) { suspend fun applySubtasksToWidgetFilter( filter: Filter, diff --git a/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.kt b/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.kt index afa504442..cb4c9ef52 100644 --- a/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.kt +++ b/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 diff --git a/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.kt b/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.kt index 7ab26f171..91634182f 100644 --- a/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.kt +++ b/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.kt @@ -5,8 +5,8 @@ */ package com.todoroo.astrid.timers -import com.todoroo.astrid.data.Task -import org.tasks.data.TaskDao +import org.tasks.data.entity.Task +import org.tasks.data.dao.TaskDao import org.tasks.notifications.NotificationManager import org.tasks.time.DateTimeUtils2.currentTimeMillis import javax.inject.Inject diff --git a/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.kt b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.kt index 5ebe69313..605d1f482 100644 --- a/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.kt +++ b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.kt @@ -24,8 +24,8 @@ import org.tasks.R import org.tasks.activities.DateAndTimePickerActivity import org.tasks.compose.collectAsStateLifecycleAware import org.tasks.compose.edit.AlarmRow -import org.tasks.data.Alarm -import org.tasks.data.Alarm.Companion.TYPE_DATE_TIME +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_DATE_TIME import org.tasks.date.DateTimeUtils import org.tasks.dialogs.DialogBuilder import org.tasks.dialogs.MyTimePickerDialog diff --git a/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSetViewModel.kt b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSetViewModel.kt index 4d5e3df87..f84a8cd7b 100644 --- a/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSetViewModel.kt +++ b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSetViewModel.kt @@ -5,7 +5,7 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update -import org.tasks.data.Alarm +import org.tasks.data.entity.Alarm class ReminderControlSetViewModel : ViewModel() { diff --git a/app/src/main/java/com/todoroo/astrid/ui/StartDateViewModel.kt b/app/src/main/java/com/todoroo/astrid/ui/StartDateViewModel.kt index ca0be2390..135948156 100644 --- a/app/src/main/java/com/todoroo/astrid/ui/StartDateViewModel.kt +++ b/app/src/main/java/com/todoroo/astrid/ui/StartDateViewModel.kt @@ -1,7 +1,7 @@ package com.todoroo.astrid.ui import androidx.lifecycle.ViewModel -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/todoroo/astrid/utility/TitleParser.kt b/app/src/main/java/com/todoroo/astrid/utility/TitleParser.kt index 5de85c1ad..bba2f9ad4 100644 --- a/app/src/main/java/com/todoroo/astrid/utility/TitleParser.kt +++ b/app/src/main/java/com/todoroo/astrid/utility/TitleParser.kt @@ -9,8 +9,8 @@ import com.mdimension.jchronic.AstridChronic import com.mdimension.jchronic.Chronic import net.fortuna.ical4j.model.Recur.Frequency import org.tasks.Strings.isNullOrEmpty -import org.tasks.data.TagDataDao -import com.todoroo.astrid.data.Task +import org.tasks.data.dao.TagDataDao +import org.tasks.data.entity.Task import org.tasks.data.createDueDate import org.tasks.repeats.RecurrenceUtils.newRecur import timber.log.Timber diff --git a/app/src/main/java/org/tasks/Notifier.kt b/app/src/main/java/org/tasks/Notifier.kt index 0af23e0aa..112aff1cd 100644 --- a/app/src/main/java/org/tasks/Notifier.kt +++ b/app/src/main/java/org/tasks/Notifier.kt @@ -7,12 +7,12 @@ import com.todoroo.astrid.api.Filter import com.todoroo.astrid.voice.VoiceOutputAssistant import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.delay -import org.tasks.data.Alarm -import org.tasks.data.Alarm.Companion.TYPE_GEO_ENTER -import org.tasks.data.Alarm.Companion.TYPE_GEO_EXIT -import org.tasks.data.Geofence -import org.tasks.data.Notification -import org.tasks.data.TaskDao +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_GEO_ENTER +import org.tasks.data.entity.Alarm.Companion.TYPE_GEO_EXIT +import org.tasks.data.entity.Geofence +import org.tasks.data.entity.Notification +import org.tasks.data.dao.TaskDao import org.tasks.data.fetchFiltered import org.tasks.intents.TaskIntents import org.tasks.notifications.AudioManager @@ -26,13 +26,13 @@ import javax.inject.Inject import kotlin.math.min class Notifier @Inject constructor( - @param:ApplicationContext private val context: Context, - private val taskDao: TaskDao, - private val notificationManager: NotificationManager, - private val telephonyManager: TelephonyManager, - private val audioManager: AudioManager, - private val voiceOutputAssistant: VoiceOutputAssistant, - private val preferences: Preferences) { + @param:ApplicationContext private val context: Context, + private val taskDao: TaskDao, + private val notificationManager: NotificationManager, + private val telephonyManager: TelephonyManager, + private val audioManager: AudioManager, + private val voiceOutputAssistant: VoiceOutputAssistant, + private val preferences: Preferences) { private val colorProvider: ColorProvider = ColorProvider(context, preferences) diff --git a/app/src/main/java/org/tasks/activities/DeleteListViewModel.kt b/app/src/main/java/org/tasks/activities/DeleteListViewModel.kt index b55b0c90d..9674cc849 100644 --- a/app/src/main/java/org/tasks/activities/DeleteListViewModel.kt +++ b/app/src/main/java/org/tasks/activities/DeleteListViewModel.kt @@ -1,7 +1,7 @@ package org.tasks.activities import dagger.hilt.android.lifecycle.HiltViewModel -import org.tasks.data.CaldavCalendar +import org.tasks.data.entity.CaldavCalendar import org.tasks.googleapis.InvokerFactory import org.tasks.ui.ActionViewModel import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt index fffed5fc6..111800345 100644 --- a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt +++ b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt @@ -16,9 +16,9 @@ import com.google.android.material.button.MaterialButtonToggleGroup import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout -import com.todoroo.andlib.sql.Field -import com.todoroo.andlib.sql.Query -import com.todoroo.andlib.sql.UnaryCriterion +import org.tasks.data.sql.Field +import org.tasks.data.sql.Query +import org.tasks.data.sql.UnaryCriterion import com.todoroo.andlib.utility.AndroidUtilities import com.todoroo.astrid.activity.MainActivity import com.todoroo.astrid.activity.TaskListFragment @@ -31,17 +31,17 @@ import com.todoroo.astrid.api.TextInputCriterion import com.todoroo.astrid.core.CriterionInstance import com.todoroo.astrid.core.CustomFilterAdapter import com.todoroo.astrid.core.CustomFilterItemTouchHelper -import com.todoroo.astrid.dao.Database -import com.todoroo.astrid.data.Task +import org.tasks.data.db.Database +import org.tasks.data.entity.Task import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.Strings -import org.tasks.data.Filter -import org.tasks.data.FilterDao +import org.tasks.data.entity.Filter +import org.tasks.data.dao.FilterDao import org.tasks.data.NO_ORDER -import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible +import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible import org.tasks.databinding.FilterSettingsActivityBinding import org.tasks.db.QueryUtils import org.tasks.extensions.Context.hideKeyboard diff --git a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.kt b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.kt index 80b29bc7f..c848d6456 100644 --- a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.kt +++ b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.kt @@ -22,9 +22,9 @@ import kotlinx.coroutines.withContext import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.Strings.isNullOrEmpty -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar -import org.tasks.data.GoogleTaskListDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.GoogleTaskListDao import org.tasks.databinding.ActivityGoogleTaskListSettingsBinding import org.tasks.extensions.Context.hideKeyboard import org.tasks.extensions.Context.toast diff --git a/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt b/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt index ff3beb980..c3c3daa1e 100644 --- a/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt +++ b/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt @@ -30,11 +30,11 @@ import kotlinx.coroutines.launch import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.caldav.BaseCaldavCalendarSettingsActivity -import org.tasks.data.CaldavDao -import org.tasks.data.FilterDao -import org.tasks.data.GoogleTaskListDao -import org.tasks.data.LocationDao -import org.tasks.data.TagDataDao +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.FilterDao +import org.tasks.data.dao.GoogleTaskListDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.dao.TagDataDao import org.tasks.data.listSettingsClass import org.tasks.databinding.ActivityTagOrganizerBinding import org.tasks.filters.FilterProvider diff --git a/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt b/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt index de93ab7fb..b752629bc 100644 --- a/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt +++ b/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt @@ -13,8 +13,8 @@ import dagger.hilt.android.AndroidEntryPoint import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.Strings.isNullOrEmpty -import org.tasks.data.LocationDao -import org.tasks.data.Place +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Place import org.tasks.data.mapPosition import org.tasks.databinding.ActivityLocationSettingsBinding import org.tasks.extensions.formatNumber diff --git a/app/src/main/java/org/tasks/activities/RenameListViewModel.kt b/app/src/main/java/org/tasks/activities/RenameListViewModel.kt index 81167ffa4..95dc245d1 100644 --- a/app/src/main/java/org/tasks/activities/RenameListViewModel.kt +++ b/app/src/main/java/org/tasks/activities/RenameListViewModel.kt @@ -2,7 +2,7 @@ package org.tasks.activities import com.google.api.services.tasks.model.TaskList import dagger.hilt.android.lifecycle.HiltViewModel -import org.tasks.data.CaldavCalendar +import org.tasks.data.entity.CaldavCalendar import org.tasks.googleapis.InvokerFactory import org.tasks.ui.CompletableViewModel import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/activities/TagSettingsActivity.kt b/app/src/main/java/org/tasks/activities/TagSettingsActivity.kt index e31e2d9e4..a55d781ea 100644 --- a/app/src/main/java/org/tasks/activities/TagSettingsActivity.kt +++ b/app/src/main/java/org/tasks/activities/TagSettingsActivity.kt @@ -16,14 +16,14 @@ import com.google.android.material.textfield.TextInputLayout import com.todoroo.astrid.activity.MainActivity import com.todoroo.astrid.activity.TaskListFragment import com.todoroo.astrid.api.TagFilter -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.UUIDHelper import dagger.hilt.android.AndroidEntryPoint import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.Strings.isNullOrEmpty -import org.tasks.data.TagDao -import org.tasks.data.TagData -import org.tasks.data.TagDataDao +import org.tasks.data.dao.TagDao +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao import org.tasks.databinding.ActivityTagSettingsBinding import org.tasks.extensions.Context.hideKeyboard import org.tasks.themes.CustomIcons diff --git a/app/src/main/java/org/tasks/activities/UriHandler.kt b/app/src/main/java/org/tasks/activities/UriHandler.kt index 5c5c98c39..104929410 100644 --- a/app/src/main/java/org/tasks/activities/UriHandler.kt +++ b/app/src/main/java/org/tasks/activities/UriHandler.kt @@ -6,7 +6,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch -import org.tasks.data.TaskDao +import org.tasks.data.dao.TaskDao import org.tasks.intents.TaskIntents import org.tasks.provider.TasksContentProvider import org.tasks.provider.TasksContentProvider.Companion.URI_OPEN_TASK diff --git a/app/src/main/java/org/tasks/auth/MicrosoftAuthenticationActivity.kt b/app/src/main/java/org/tasks/auth/MicrosoftAuthenticationActivity.kt index d8b27a73a..f1f433e19 100644 --- a/app/src/main/java/org/tasks/auth/MicrosoftAuthenticationActivity.kt +++ b/app/src/main/java/org/tasks/auth/MicrosoftAuthenticationActivity.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import androidx.lifecycle.lifecycleScope -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.UUIDHelper import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -35,9 +35,9 @@ import org.json.JSONObject import org.tasks.R import org.tasks.analytics.Constants import org.tasks.analytics.Firebase -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavAccount.Companion.TYPE_MICROSOFT -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_MICROSOFT +import org.tasks.data.dao.CaldavDao import org.tasks.http.HttpClientFactory import org.tasks.security.KeyStoreEncryption import org.tasks.sync.microsoft.requestTokenExchange diff --git a/app/src/main/java/org/tasks/auth/SignInViewModel.kt b/app/src/main/java/org/tasks/auth/SignInViewModel.kt index 9b81b1e61..cf42a882c 100644 --- a/app/src/main/java/org/tasks/auth/SignInViewModel.kt +++ b/app/src/main/java/org/tasks/auth/SignInViewModel.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.UUIDHelper import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import net.openid.appauth.AuthorizationException @@ -14,19 +14,19 @@ import net.openid.appauth.GrantTypeValues import net.openid.appauth.TokenRequest import org.tasks.R import org.tasks.caldav.CaldavClientProvider -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.dao.CaldavDao import org.tasks.security.KeyStoreEncryption import timber.log.Timber import javax.inject.Inject @HiltViewModel class SignInViewModel @Inject constructor( - @ApplicationContext private val context: Context, - private val provider: CaldavClientProvider, - private val caldavDao: CaldavDao, - private val encryption: KeyStoreEncryption, - private val debugConnectionBuilder: DebugConnectionBuilder + @ApplicationContext private val context: Context, + private val provider: CaldavClientProvider, + private val caldavDao: CaldavDao, + private val encryption: KeyStoreEncryption, + private val debugConnectionBuilder: DebugConnectionBuilder ) : ViewModel() { val error = MutableLiveData() diff --git a/app/src/main/java/org/tasks/backup/BackupContainer.kt b/app/src/main/java/org/tasks/backup/BackupContainer.kt index ec98c0d96..8f1e5bb5a 100644 --- a/app/src/main/java/org/tasks/backup/BackupContainer.kt +++ b/app/src/main/java/org/tasks/backup/BackupContainer.kt @@ -1,25 +1,38 @@ package org.tasks.backup -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.tasks.backup.TasksJsonImporter.LegacyLocation import org.tasks.data.* +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Attachment +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.entity.CaldavTask +import org.tasks.data.entity.Filter +import org.tasks.data.entity.Geofence +import org.tasks.data.entity.Place +import org.tasks.data.entity.Tag +import org.tasks.data.entity.TagData +import org.tasks.data.entity.TaskAttachment +import org.tasks.data.entity.TaskListMetadata +import org.tasks.data.entity.UserActivity class BackupContainer( - val tasks: List?, - val places: List?, - val tags: List?, - val filters: List?, - val caldavAccounts: List?, - val caldavCalendars: List?, - val taskListMetadata: List?, - val taskAttachments: List?, - val intPrefs: Map?, - val longPrefs: Map?, - val stringPrefs: Map?, - val boolPrefs: Map?, - val setPrefs: Map>?, - val googleTaskAccounts: List? = emptyList(), - val googleTaskLists: List? = emptyList(), + val tasks: List?, + val places: List?, + val tags: List?, + val filters: List?, + val caldavAccounts: List?, + val caldavCalendars: List?, + val taskListMetadata: List?, + val taskAttachments: List?, + val intPrefs: Map?, + val longPrefs: Map?, + val stringPrefs: Map?, + val boolPrefs: Map?, + val setPrefs: Map>?, + val googleTaskAccounts: List? = emptyList(), + val googleTaskLists: List? = emptyList(), ) { class TaskBackup( val task: Task, diff --git a/app/src/main/java/org/tasks/backup/TasksJsonExporter.kt b/app/src/main/java/org/tasks/backup/TasksJsonExporter.kt index 164595687..2b6e4711c 100755 --- a/app/src/main/java/org/tasks/backup/TasksJsonExporter.kt +++ b/app/src/main/java/org/tasks/backup/TasksJsonExporter.kt @@ -10,12 +10,22 @@ import com.google.common.io.Files import com.google.gson.Gson import com.google.gson.GsonBuilder import com.todoroo.andlib.utility.DialogUtilities -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.tasks.BuildConfig import org.tasks.R import org.tasks.backup.BackupContainer.TaskBackup import org.tasks.caldav.VtodoCache import org.tasks.data.* +import org.tasks.data.dao.AlarmDao +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.FilterDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.dao.TagDao +import org.tasks.data.dao.TagDataDao +import org.tasks.data.dao.TaskAttachmentDao +import org.tasks.data.dao.TaskDao +import org.tasks.data.dao.TaskListMetadataDao +import org.tasks.data.dao.UserActivityDao import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.extensions.Context.toast import org.tasks.files.FileHelper @@ -31,19 +41,19 @@ import java.nio.charset.Charset import javax.inject.Inject class TasksJsonExporter @Inject constructor( - private val tagDataDao: TagDataDao, - private val taskDao: TaskDao, - private val userActivityDao: UserActivityDao, - private val preferences: Preferences, - private val alarmDao: AlarmDao, - private val locationDao: LocationDao, - private val tagDao: TagDao, - private val filterDao: FilterDao, - private val taskAttachmentDao: TaskAttachmentDao, - private val caldavDao: CaldavDao, - private val workManager: WorkManager, - private val taskListMetadataDao: TaskListMetadataDao, - private val vtodoCache: VtodoCache, + private val tagDataDao: TagDataDao, + private val taskDao: TaskDao, + private val userActivityDao: UserActivityDao, + private val preferences: Preferences, + private val alarmDao: AlarmDao, + private val locationDao: LocationDao, + private val tagDao: TagDao, + private val filterDao: FilterDao, + private val taskAttachmentDao: TaskAttachmentDao, + private val caldavDao: CaldavDao, + private val workManager: WorkManager, + private val taskListMetadataDao: TaskListMetadataDao, + private val vtodoCache: VtodoCache, ) { private var context: Context? = null diff --git a/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt b/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt index 33ff371d6..48d6873ee 100644 --- a/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt +++ b/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt @@ -7,7 +7,7 @@ import android.os.Handler import com.google.gson.Gson import com.google.gson.JsonObject import com.todoroo.astrid.dao.TaskDao -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import com.todoroo.astrid.service.TaskCreator.Companion.getDefaultAlarms import com.todoroo.astrid.service.TaskMover import com.todoroo.astrid.service.Upgrade_13_2 @@ -19,24 +19,24 @@ import com.todoroo.astrid.service.Upgrader.Companion.getAndroidColor import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.caldav.VtodoCache -import org.tasks.data.AlarmDao -import org.tasks.data.Attachment -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavDao -import org.tasks.data.CaldavTask -import org.tasks.data.FilterDao -import org.tasks.data.Geofence -import org.tasks.data.LocationDao -import org.tasks.data.Place -import org.tasks.data.Tag -import org.tasks.data.TagDao -import org.tasks.data.TagData -import org.tasks.data.TagDataDao -import org.tasks.data.TaskAttachmentDao -import org.tasks.data.TaskListMetadataDao -import org.tasks.data.UserActivityDao +import org.tasks.data.dao.AlarmDao +import org.tasks.data.entity.Attachment +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask +import org.tasks.data.dao.FilterDao +import org.tasks.data.entity.Geofence +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Place +import org.tasks.data.entity.Tag +import org.tasks.data.dao.TagDao +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao +import org.tasks.data.dao.TaskAttachmentDao +import org.tasks.data.dao.TaskListMetadataDao +import org.tasks.data.dao.UserActivityDao import org.tasks.db.Migrations.repeatFrom import org.tasks.db.Migrations.withoutFrom import org.tasks.filters.FilterCriteriaProvider @@ -49,21 +49,21 @@ import java.io.InputStreamReader import javax.inject.Inject class TasksJsonImporter @Inject constructor( - private val tagDataDao: TagDataDao, - private val userActivityDao: UserActivityDao, - private val taskDao: TaskDao, - private val locationDao: LocationDao, - private val localBroadcastManager: LocalBroadcastManager, - private val alarmDao: AlarmDao, - private val tagDao: TagDao, - private val filterDao: FilterDao, - private val taskAttachmentDao: TaskAttachmentDao, - private val caldavDao: CaldavDao, - private val preferences: Preferences, - private val taskMover: TaskMover, - private val taskListMetadataDao: TaskListMetadataDao, - private val vtodoCache: VtodoCache, - private val filterCriteriaProvider: FilterCriteriaProvider, + private val tagDataDao: TagDataDao, + private val userActivityDao: UserActivityDao, + private val taskDao: TaskDao, + private val locationDao: LocationDao, + private val localBroadcastManager: LocalBroadcastManager, + private val alarmDao: AlarmDao, + private val tagDao: TagDao, + private val filterDao: FilterDao, + private val taskAttachmentDao: TaskAttachmentDao, + private val caldavDao: CaldavDao, + private val preferences: Preferences, + private val taskMover: TaskMover, + private val taskListMetadataDao: TaskListMetadataDao, + private val vtodoCache: VtodoCache, + private val filterCriteriaProvider: FilterCriteriaProvider, ) { private val result = ImportResult() diff --git a/app/src/main/java/org/tasks/billing/Inventory.kt b/app/src/main/java/org/tasks/billing/Inventory.kt index a23bb09ac..458ac2239 100644 --- a/app/src/main/java/org/tasks/billing/Inventory.kt +++ b/app/src/main/java/org/tasks/billing/Inventory.kt @@ -7,8 +7,8 @@ import dagger.hilt.android.qualifiers.ApplicationContext import org.tasks.BuildConfig import org.tasks.LocalBroadcastManager import org.tasks.R -import org.tasks.data.CaldavAccount.Companion.TYPE_TASKS -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_TASKS +import org.tasks.data.dao.CaldavDao import org.tasks.data.isTasksSubscription import org.tasks.extensions.Context.openUri import org.tasks.preferences.Preferences diff --git a/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt index 7af1d5afa..48209403c 100644 --- a/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt @@ -25,7 +25,7 @@ import com.franmontiel.persistentcookiejar.persistence.CookiePersistor import com.google.android.material.composethemeadapter.MdcTheme import com.google.android.material.snackbar.BaseTransientBottomBar import com.google.android.material.snackbar.Snackbar -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import com.todoroo.astrid.service.TaskDeleter import kotlinx.coroutines.launch import okhttp3.HttpUrl.Companion.toHttpUrlOrNull @@ -35,9 +35,9 @@ import org.tasks.analytics.Firebase import org.tasks.billing.Inventory import org.tasks.billing.PurchaseActivity import org.tasks.compose.ServerSelector -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavAccount.Companion.SERVER_UNKNOWN -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_UNKNOWN +import org.tasks.data.dao.CaldavDao import org.tasks.databinding.ActivityCaldavAccountSettingsBinding import org.tasks.dialogs.DialogBuilder import org.tasks.dialogs.Linkify diff --git a/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt index 6d4e84df1..a2bc98621 100644 --- a/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt +++ b/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt @@ -16,15 +16,15 @@ import com.google.android.material.textfield.TextInputLayout import com.todoroo.astrid.activity.MainActivity import com.todoroo.astrid.activity.TaskListFragment import com.todoroo.astrid.api.CaldavFilter -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.UUIDHelper import com.todoroo.astrid.service.TaskDeleter import kotlinx.coroutines.runBlocking import org.tasks.R import org.tasks.Strings.isNullOrEmpty import org.tasks.activities.BaseListSettingsActivity -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao import org.tasks.databinding.ActivityCaldavCalendarSettingsBinding import org.tasks.extensions.Context.hideKeyboard import org.tasks.themes.CustomIcons @@ -114,10 +114,11 @@ abstract class BaseCaldavCalendarSettingsActivity : BaseListSettingsActivity() { protected abstract suspend fun createCalendar(caldavAccount: CaldavAccount, name: String, color: Int) protected abstract suspend fun updateNameAndColor( - account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) + account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) protected abstract suspend fun deleteCalendar( - caldavAccount: CaldavAccount, caldavCalendar: CaldavCalendar) + caldavAccount: CaldavAccount, caldavCalendar: CaldavCalendar + ) private fun showProgressIndicator() { progressView.visibility = View.VISIBLE diff --git a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt index 86059a91f..3e582283f 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt @@ -5,11 +5,11 @@ import android.os.Bundle import androidx.activity.viewModels import androidx.appcompat.widget.Toolbar import androidx.core.view.isVisible -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.UUIDHelper import dagger.hilt.android.AndroidEntryPoint import org.tasks.R import org.tasks.analytics.Constants -import org.tasks.data.CaldavAccount +import org.tasks.data.entity.CaldavAccount import timber.log.Timber @AndroidEntryPoint diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.kt index c740af7f8..6cc2043a5 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.kt +++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.kt @@ -17,14 +17,14 @@ import kotlinx.coroutines.launch import org.tasks.R import org.tasks.compose.ListSettingsComposables.PrincipalList import org.tasks.compose.ShareInvite.ShareInviteDialog -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavAccount.Companion.SERVER_NEXTCLOUD -import org.tasks.data.CaldavAccount.Companion.SERVER_OWNCLOUD -import org.tasks.data.CaldavAccount.Companion.SERVER_SABREDAV -import org.tasks.data.CaldavAccount.Companion.SERVER_TASKS -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavCalendar.Companion.ACCESS_OWNER -import org.tasks.data.PrincipalDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_NEXTCLOUD +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_OWNCLOUD +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_SABREDAV +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_TASKS +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_OWNER +import org.tasks.data.dao.PrincipalDao import org.tasks.data.PrincipalWithAccess import javax.inject.Inject @@ -116,10 +116,10 @@ class CaldavCalendarSettingsActivity : BaseCaldavCalendarSettingsActivity() { } override suspend fun updateNameAndColor( - account: CaldavAccount, - calendar: CaldavCalendar, - name: String, - color: Int + account: CaldavAccount, + calendar: CaldavCalendar, + name: String, + color: Int ) { viewModel.updateCalendar(account, calendar, name, color, selectedIcon) } diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarViewModel.kt b/app/src/main/java/org/tasks/caldav/CaldavCalendarViewModel.kt index 67effb04d..817db2aa9 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavCalendarViewModel.kt +++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarViewModel.kt @@ -4,14 +4,18 @@ import android.content.Intent import com.todoroo.astrid.activity.MainActivity import com.todoroo.astrid.activity.TaskListFragment import com.todoroo.astrid.api.CaldavFilter -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.UUIDHelper import com.todoroo.astrid.service.TaskDeleter import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.tasks.data.* -import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_WRITE -import org.tasks.data.CaldavCalendar.Companion.INVITE_UNKNOWN +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_WRITE +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_UNKNOWN +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.PrincipalDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar import org.tasks.sync.SyncAdapters import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/caldav/CaldavClient.kt b/app/src/main/java/org/tasks/caldav/CaldavClient.kt index f4f547137..5b30de52f 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavClient.kt +++ b/app/src/main/java/org/tasks/caldav/CaldavClient.kt @@ -13,7 +13,7 @@ import at.bitfire.dav4jvm.exception.DavException import at.bitfire.dav4jvm.exception.HttpException import at.bitfire.dav4jvm.property.* import at.bitfire.dav4jvm.property.ResourceType.Companion.CALENDAR -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.UUIDHelper import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import okhttp3.HttpUrl @@ -29,12 +29,12 @@ import org.tasks.caldav.property.OCInvite import org.tasks.caldav.property.OCOwnerPrincipal import org.tasks.caldav.property.PropertyUtils.NS_OWNCLOUD import org.tasks.caldav.property.ShareAccess -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavAccount.Companion.SERVER_NEXTCLOUD -import org.tasks.data.CaldavAccount.Companion.SERVER_OWNCLOUD -import org.tasks.data.CaldavAccount.Companion.SERVER_SABREDAV -import org.tasks.data.CaldavAccount.Companion.SERVER_TASKS -import org.tasks.data.CaldavCalendar +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_NEXTCLOUD +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_OWNCLOUD +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_SABREDAV +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_TASKS +import org.tasks.data.entity.CaldavCalendar import org.tasks.ui.DisplayableException import org.xmlpull.v1.XmlPullParserException import org.xmlpull.v1.XmlPullParserFactory diff --git a/app/src/main/java/org/tasks/caldav/CaldavClientProvider.kt b/app/src/main/java/org/tasks/caldav/CaldavClientProvider.kt index e14f4349e..ad816d31a 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavClientProvider.kt +++ b/app/src/main/java/org/tasks/caldav/CaldavClientProvider.kt @@ -9,7 +9,7 @@ import okhttp3.Interceptor import okhttp3.OkHttpClient import org.tasks.R import org.tasks.billing.Inventory -import org.tasks.data.CaldavAccount +import org.tasks.data.entity.CaldavAccount import org.tasks.data.getPassword import org.tasks.http.HttpClientFactory import org.tasks.security.KeyStoreEncryption diff --git a/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.kt b/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.kt index 4b5e2d781..87ce56481 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.kt +++ b/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.kt @@ -12,8 +12,8 @@ import at.bitfire.dav4jvm.property.* import at.bitfire.dav4jvm.property.GetETag.Companion.fromResponse import at.bitfire.ical4android.ICalendar.Companion.prodId import com.todoroo.astrid.dao.TaskDao -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.entity.Task +import org.tasks.data.UUIDHelper import com.todoroo.astrid.service.TaskDeleter import dagger.hilt.android.qualifiers.ApplicationContext import net.fortuna.ical4j.model.property.ProdId @@ -35,22 +35,27 @@ import org.tasks.caldav.property.ShareAccess.Companion.NO_ACCESS import org.tasks.caldav.property.ShareAccess.Companion.READ import org.tasks.caldav.property.ShareAccess.Companion.READ_WRITE import org.tasks.caldav.property.ShareAccess.Companion.SHARED_OWNER -import org.tasks.data.* -import org.tasks.data.CaldavAccount.Companion.ERROR_UNAUTHORIZED -import org.tasks.data.CaldavAccount.Companion.SERVER_OPEN_XCHANGE -import org.tasks.data.CaldavAccount.Companion.SERVER_OWNCLOUD -import org.tasks.data.CaldavAccount.Companion.SERVER_SABREDAV -import org.tasks.data.CaldavAccount.Companion.SERVER_TASKS -import org.tasks.data.CaldavAccount.Companion.SERVER_UNKNOWN -import org.tasks.data.CaldavCalendar.Companion.ACCESS_OWNER -import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_ONLY -import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_WRITE -import org.tasks.data.CaldavCalendar.Companion.ACCESS_UNKNOWN -import org.tasks.data.CaldavCalendar.Companion.INVITE_ACCEPTED -import org.tasks.data.CaldavCalendar.Companion.INVITE_DECLINED -import org.tasks.data.CaldavCalendar.Companion.INVITE_INVALID -import org.tasks.data.CaldavCalendar.Companion.INVITE_NO_RESPONSE -import org.tasks.data.CaldavCalendar.Companion.INVITE_UNKNOWN +import org.tasks.data.entity.CaldavAccount.Companion.ERROR_UNAUTHORIZED +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_OPEN_XCHANGE +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_OWNCLOUD +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_SABREDAV +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_TASKS +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_UNKNOWN +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_OWNER +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_ONLY +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_WRITE +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_UNKNOWN +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_ACCEPTED +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_DECLINED +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_INVALID +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_NO_RESPONSE +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_UNKNOWN +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.PrincipalDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.entity.CaldavTask +import org.tasks.data.entity.PrincipalAccess import timber.log.Timber import java.io.IOException import java.net.ConnectException @@ -62,17 +67,17 @@ import javax.inject.Inject import javax.net.ssl.SSLException class CaldavSynchronizer @Inject constructor( - @param:ApplicationContext private val context: Context, - private val caldavDao: CaldavDao, - private val taskDao: TaskDao, - private val localBroadcastManager: LocalBroadcastManager, - private val taskDeleter: TaskDeleter, - private val inventory: Inventory, - private val firebase: Firebase, - private val provider: CaldavClientProvider, - private val iCal: iCalendar, - private val principalDao: PrincipalDao, - private val vtodoCache: VtodoCache, + @param:ApplicationContext private val context: Context, + private val caldavDao: CaldavDao, + private val taskDao: TaskDao, + private val localBroadcastManager: LocalBroadcastManager, + private val taskDeleter: TaskDeleter, + private val inventory: Inventory, + private val firebase: Firebase, + private val provider: CaldavClientProvider, + private val iCal: iCalendar, + private val principalDao: PrincipalDao, + private val vtodoCache: VtodoCache, ) { suspend fun sync(account: CaldavAccount) { Thread.currentThread().contextClassLoader = context.classLoader @@ -277,10 +282,10 @@ class CaldavSynchronizer @Inject constructor( } private suspend fun pushLocalChanges( - account: CaldavAccount, - caldavCalendar: CaldavCalendar, - httpClient: OkHttpClient, - httpUrl: HttpUrl + account: CaldavAccount, + caldavCalendar: CaldavCalendar, + httpClient: OkHttpClient, + httpUrl: HttpUrl ) { for (task in caldavDao.getMoved(caldavCalendar.uuid!!)) { deleteRemoteResource(httpClient, httpUrl, caldavCalendar, task) @@ -295,10 +300,10 @@ class CaldavSynchronizer @Inject constructor( } private suspend fun deleteRemoteResource( - httpClient: OkHttpClient, - httpUrl: HttpUrl, - calendar: CaldavCalendar, - caldavTask: CaldavTask + httpClient: OkHttpClient, + httpUrl: HttpUrl, + calendar: CaldavCalendar, + caldavTask: CaldavTask ): Boolean { try { if (!isNullOrEmpty(caldavTask.obj)) { diff --git a/app/src/main/java/org/tasks/caldav/GeoUtils.kt b/app/src/main/java/org/tasks/caldav/GeoUtils.kt index e74c8f6db..7a128a4c1 100644 --- a/app/src/main/java/org/tasks/caldav/GeoUtils.kt +++ b/app/src/main/java/org/tasks/caldav/GeoUtils.kt @@ -2,7 +2,7 @@ package org.tasks.caldav import net.fortuna.ical4j.model.property.Geo import org.tasks.data.Location -import org.tasks.data.Place +import org.tasks.data.entity.Place import java.math.BigDecimal import kotlin.math.min diff --git a/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt index 28075f2a2..d9e2b54e1 100644 --- a/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt +++ b/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt @@ -4,9 +4,9 @@ import android.os.Bundle import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.runBlocking import org.tasks.R -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao @AndroidEntryPoint class LocalListSettingsActivity : BaseCaldavCalendarSettingsActivity() { @@ -22,7 +22,7 @@ class LocalListSettingsActivity : BaseCaldavCalendarSettingsActivity() { createSuccessful(null) override suspend fun updateNameAndColor( - account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) = + account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) = updateCalendar() override suspend fun deleteCalendar(caldavAccount: CaldavAccount, caldavCalendar: CaldavCalendar) = diff --git a/app/src/main/java/org/tasks/caldav/VtodoCache.kt b/app/src/main/java/org/tasks/caldav/VtodoCache.kt index 36e906abe..5d19c1e36 100644 --- a/app/src/main/java/org/tasks/caldav/VtodoCache.kt +++ b/app/src/main/java/org/tasks/caldav/VtodoCache.kt @@ -1,9 +1,9 @@ package org.tasks.caldav -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavDao -import org.tasks.data.CaldavTask +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask import java.io.File import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/org/tasks/caldav/extensions/VAlarm.kt b/app/src/main/java/org/tasks/caldav/extensions/VAlarm.kt index 1ee7a01d6..eed9949ca 100644 --- a/app/src/main/java/org/tasks/caldav/extensions/VAlarm.kt +++ b/app/src/main/java/org/tasks/caldav/extensions/VAlarm.kt @@ -10,7 +10,7 @@ import net.fortuna.ical4j.model.property.Repeat import net.fortuna.ical4j.model.property.Trigger import org.tasks.caldav.iCalendar import org.tasks.caldav.iCalendar.Companion.getDateTime -import org.tasks.data.Alarm +import org.tasks.data.entity.Alarm import java.time.Duration import java.time.Instant import java.time.temporal.TemporalAmount diff --git a/app/src/main/java/org/tasks/caldav/iCalendar.kt b/app/src/main/java/org/tasks/caldav/iCalendar.kt index a83d27fc6..22b955b5d 100644 --- a/app/src/main/java/org/tasks/caldav/iCalendar.kt +++ b/app/src/main/java/org/tasks/caldav/iCalendar.kt @@ -28,24 +28,24 @@ import org.tasks.caldav.GeoUtils.toGeo import org.tasks.caldav.GeoUtils.toLikeString import org.tasks.caldav.extensions.toAlarms import org.tasks.caldav.extensions.toVAlarms -import org.tasks.data.Alarm -import org.tasks.data.Alarm.Companion.TYPE_RANDOM -import org.tasks.data.Alarm.Companion.TYPE_SNOOZE -import org.tasks.data.AlarmDao -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_ONLY -import org.tasks.data.CaldavDao -import org.tasks.data.CaldavTask -import org.tasks.data.LocationDao -import org.tasks.data.Place -import org.tasks.data.TagDao -import org.tasks.data.TagData -import org.tasks.data.TagDataDao -import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL_SPECIFIC_DAY -import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL_SPECIFIC_DAY_TIME -import com.todoroo.astrid.data.Task.Companion.URGENCY_SPECIFIC_DAY -import com.todoroo.astrid.data.Task.Companion.URGENCY_SPECIFIC_DAY_TIME +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_RANDOM +import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE +import org.tasks.data.dao.AlarmDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_ONLY +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Place +import org.tasks.data.dao.TagDao +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao +import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_SPECIFIC_DAY +import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_SPECIFIC_DAY_TIME +import org.tasks.data.entity.Task.Companion.URGENCY_SPECIFIC_DAY +import org.tasks.data.entity.Task.Companion.URGENCY_SPECIFIC_DAY_TIME import org.tasks.data.createDueDate import org.tasks.data.createGeofence import org.tasks.data.createHideUntil @@ -73,19 +73,19 @@ import kotlin.math.min @Suppress("ClassName") class iCalendar @Inject constructor( - private val tagDataDao: TagDataDao, - private val preferences: Preferences, - private val locationDao: LocationDao, - private val workManager: WorkManager, - private val geofenceApi: GeofenceApi, - private val taskCreator: TaskCreator, - private val tagDao: TagDao, - private val taskDao: TaskDao, - private val caldavDao: CaldavDao, - private val alarmDao: AlarmDao, - private val alarmService: AlarmService, - private val vtodoCache: VtodoCache, - private val notificationManager: NotificationManager, + private val tagDataDao: TagDataDao, + private val preferences: Preferences, + private val locationDao: LocationDao, + private val workManager: WorkManager, + private val geofenceApi: GeofenceApi, + private val taskCreator: TaskCreator, + private val tagDao: TagDao, + private val taskDao: TaskDao, + private val caldavDao: CaldavDao, + private val alarmDao: AlarmDao, + private val alarmService: AlarmService, + private val vtodoCache: VtodoCache, + private val notificationManager: NotificationManager, ) { suspend fun setPlace(taskId: Long, geo: Geo?) { @@ -144,7 +144,7 @@ class iCalendar @Inject constructor( account: CaldavAccount, calendar: CaldavCalendar, caldavTask: CaldavTask, - task: com.todoroo.astrid.data.Task + task: org.tasks.data.entity.Task ): ByteArray { var remoteModel: Task? = null try { @@ -165,7 +165,7 @@ class iCalendar @Inject constructor( suspend fun toVtodo( account: CaldavAccount, caldavTask: CaldavTask, - task: com.todoroo.astrid.data.Task, + task: org.tasks.data.entity.Task, remoteModel: Task ): ByteArray { remoteModel.applyLocal(caldavTask, task) @@ -219,7 +219,7 @@ class iCalendar @Inject constructor( remoteId = remote.uid, obj = obj ) - val isNew = caldavTask.id == com.todoroo.astrid.data.Task.NO_ID + val isNew = caldavTask.id == org.tasks.data.entity.Task.NO_ID val dirty = task.modificationDate > caldavTask.lastSync || caldavTask.lastSync == 0L val local = vtodoCache.getVtodo(calendar, caldavTask)?.let { fromVtodo(it) } task.applyRemote(remote, local) @@ -303,7 +303,7 @@ class iCalendar @Inject constructor( private val IS_MOZ_SNOOZE_TIME = { x: Property? -> x?.name.equals(MOZ_SNOOZE_TIME, true) } private val IS_MOZ_LASTACK = { x: Property? -> x?.name.equals(MOZ_LASTACK, true) } - fun Due?.apply(task: com.todoroo.astrid.data.Task) { + fun Due?.apply(task: org.tasks.data.entity.Task) { task.dueDate = toMillis() } @@ -320,11 +320,11 @@ class iCalendar @Inject constructor( ) } - fun DtStart?.apply(task: com.todoroo.astrid.data.Task) { + fun DtStart?.apply(task: org.tasks.data.entity.Task) { task.hideUntil = toMillis(task) } - fun DtStart?.toMillis(task: com.todoroo.astrid.data.Task) = + fun DtStart?.toMillis(task: org.tasks.data.entity.Task) = when (this?.date) { null -> 0 is DateTime -> task.createHideUntil(HIDE_UNTIL_SPECIFIC_DAY_TIME, getLocal(this)) @@ -443,7 +443,7 @@ class iCalendar @Inject constructor( ?: unknownProperties.removeIf(IS_MOZ_SNOOZE_TIME) } - fun Task.applyLocal(caldavTask: CaldavTask, task: com.todoroo.astrid.data.Task) { + fun Task.applyLocal(caldavTask: CaldavTask, task: org.tasks.data.entity.Task) { createdAt = newDateTime(task.creationDate).toUTC().millis summary = task.title description = task.notes @@ -486,9 +486,9 @@ class iCalendar @Inject constructor( } lastModified = newDateTime(task.modificationDate).toUTC().millis priority = when (task.priority) { - com.todoroo.astrid.data.Task.Priority.NONE -> 0 - com.todoroo.astrid.data.Task.Priority.MEDIUM -> 5 - com.todoroo.astrid.data.Task.Priority.HIGH -> + org.tasks.data.entity.Task.Priority.NONE -> 0 + org.tasks.data.entity.Task.Priority.MEDIUM -> 5 + org.tasks.data.entity.Task.Priority.HIGH -> if (priority < 5) max(1, priority) else 1 else -> if (priority > 5) min(9, priority) else 9 } diff --git a/app/src/main/java/org/tasks/caldav/iCalendarMerge.kt b/app/src/main/java/org/tasks/caldav/iCalendarMerge.kt index 51146c82a..c8c37ab8a 100644 --- a/app/src/main/java/org/tasks/caldav/iCalendarMerge.kt +++ b/app/src/main/java/org/tasks/caldav/iCalendarMerge.kt @@ -7,21 +7,21 @@ import org.tasks.caldav.iCalendar.Companion.getLocal import org.tasks.caldav.iCalendar.Companion.order import org.tasks.caldav.iCalendar.Companion.parent import org.tasks.caldav.iCalendar.Companion.toMillis -import org.tasks.data.CaldavTask -import com.todoroo.astrid.data.Task.Priority.Companion.HIGH -import com.todoroo.astrid.data.Task.Priority.Companion.LOW -import com.todoroo.astrid.data.Task.Priority.Companion.MEDIUM -import com.todoroo.astrid.data.Task.Priority.Companion.NONE +import org.tasks.data.entity.CaldavTask +import org.tasks.data.entity.Task.Priority.Companion.HIGH +import org.tasks.data.entity.Task.Priority.Companion.LOW +import org.tasks.data.entity.Task.Priority.Companion.MEDIUM +import org.tasks.data.entity.Task.Priority.Companion.NONE import org.tasks.data.setRecurrence import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.time.DateTime.UTC import org.tasks.time.DateTimeUtils.startOfSecond import org.tasks.time.DateTimeUtils2.currentTimeMillis -fun com.todoroo.astrid.data.Task.applyRemote( +fun org.tasks.data.entity.Task.applyRemote( remote: Task, local: Task? -): com.todoroo.astrid.data.Task { +): org.tasks.data.entity.Task { applyCompletedAt(remote, local) applyCreatedAt(remote, local) applyTitle(remote, local) @@ -40,7 +40,7 @@ fun CaldavTask.applyRemote(remote: Task, local: Task?): CaldavTask { return this } -private fun com.todoroo.astrid.data.Task.applyCompletedAt(remote: Task, local: Task?) { +private fun org.tasks.data.entity.Task.applyCompletedAt(remote: Task, local: Task?) { if (local == null || (local.completedAt?.let { getLocal(it) } ?: 0) == completionDate.startOfSecond() && (local.status == Status.VTODO_COMPLETED) == isCompleted @@ -58,7 +58,7 @@ private fun com.todoroo.astrid.data.Task.applyCompletedAt(remote: Task, local: T } } -private fun com.todoroo.astrid.data.Task.applyCreatedAt(remote: Task, local: Task?) { +private fun org.tasks.data.entity.Task.applyCreatedAt(remote: Task, local: Task?) { val localCreated = local?.createdAt?.let { newDateTime(it, UTC) }?.toLocal()?.millis if (localCreated == null || localCreated == creationDate) { remote.createdAt?.let { @@ -67,49 +67,49 @@ private fun com.todoroo.astrid.data.Task.applyCreatedAt(remote: Task, local: Tas } } -private fun com.todoroo.astrid.data.Task.applyTitle(remote: Task, local: Task?) { +private fun org.tasks.data.entity.Task.applyTitle(remote: Task, local: Task?) { if (local == null || local.summary == title) { title = remote.summary } } -private fun com.todoroo.astrid.data.Task.applyDescription(remote: Task, local: Task?) { +private fun org.tasks.data.entity.Task.applyDescription(remote: Task, local: Task?) { if (local == null || local.description == notes) { notes = remote.description } } -private fun com.todoroo.astrid.data.Task.applyPriority(remote: Task, local: Task?) { +private fun org.tasks.data.entity.Task.applyPriority(remote: Task, local: Task?) { if (local == null || local.tasksPriority == priority) { priority = remote.tasksPriority } } -private fun com.todoroo.astrid.data.Task.applyRecurrence(remote: Task, local: Task?) { +private fun org.tasks.data.entity.Task.applyRecurrence(remote: Task, local: Task?) { if (local == null || local.rRule?.recur?.toString() == recurrence) { setRecurrence(remote.rRule?.recur) } } -private fun com.todoroo.astrid.data.Task.applyDue(remote: Task, local: Task?) { +private fun org.tasks.data.entity.Task.applyDue(remote: Task, local: Task?) { if (local == null || local.due.toMillis() == dueDate) { dueDate = remote.due.toMillis() } } -private fun com.todoroo.astrid.data.Task.applyStart(remote: Task, local: Task?) { +private fun org.tasks.data.entity.Task.applyStart(remote: Task, local: Task?) { if (local == null || local.dtStart.toMillis(this) == hideUntil) { hideUntil = remote.dtStart.toMillis(this) } } -private fun com.todoroo.astrid.data.Task.applyCollapsed(remote: Task, local: Task?) { +private fun org.tasks.data.entity.Task.applyCollapsed(remote: Task, local: Task?) { if (local == null || isCollapsed == local.collapsed) { isCollapsed = remote.collapsed } } -private fun com.todoroo.astrid.data.Task.applyOrder(remote: Task, local: Task?) { +private fun org.tasks.data.entity.Task.applyOrder(remote: Task, local: Task?) { if (local == null || local.order == order) { order = remote.order } diff --git a/app/src/main/java/org/tasks/calendars/CalendarEventProvider.java b/app/src/main/java/org/tasks/calendars/CalendarEventProvider.java index 99ec6e16a..d93434621 100644 --- a/app/src/main/java/org/tasks/calendars/CalendarEventProvider.java +++ b/app/src/main/java/org/tasks/calendars/CalendarEventProvider.java @@ -11,7 +11,7 @@ import android.provider.CalendarContract; import androidx.annotation.Nullable; -import com.todoroo.astrid.data.Task; +import org.tasks.data.entity.Task; import org.tasks.preferences.PermissionChecker; diff --git a/app/src/main/java/org/tasks/compose/AddReminderDialog.kt b/app/src/main/java/org/tasks/compose/AddReminderDialog.kt index cf5edf30f..bc0fcd0aa 100644 --- a/app/src/main/java/org/tasks/compose/AddReminderDialog.kt +++ b/app/src/main/java/org/tasks/compose/AddReminderDialog.kt @@ -32,12 +32,12 @@ import com.google.android.material.composethemeadapter.MdcTheme import com.todoroo.astrid.ui.ReminderControlSetViewModel.ViewState import kotlinx.coroutines.android.awaitFrame import org.tasks.R -import org.tasks.data.Alarm -import org.tasks.data.Alarm.Companion.TYPE_DATE_TIME -import org.tasks.data.Alarm.Companion.TYPE_RANDOM -import org.tasks.data.Alarm.Companion.TYPE_REL_END -import org.tasks.data.Alarm.Companion.TYPE_REL_START -import org.tasks.data.Alarm.Companion.whenStarted +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_DATE_TIME +import org.tasks.data.entity.Alarm.Companion.TYPE_RANDOM +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_END +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_START +import org.tasks.data.entity.Alarm.Companion.whenStarted import org.tasks.reminders.AlarmToString.Companion.getRepeatString import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/tasks/compose/CheckBox.kt b/app/src/main/java/org/tasks/compose/CheckBox.kt index b403bd466..aa92804dd 100644 --- a/app/src/main/java/org/tasks/compose/CheckBox.kt +++ b/app/src/main/java/org/tasks/compose/CheckBox.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.tasks.themes.ColorProvider import org.tasks.ui.CheckBoxProvider.Companion.getCheckboxRes diff --git a/app/src/main/java/org/tasks/compose/PrincipalList.kt b/app/src/main/java/org/tasks/compose/PrincipalList.kt index 27166750a..7bb93d2e8 100644 --- a/app/src/main/java/org/tasks/compose/PrincipalList.kt +++ b/app/src/main/java/org/tasks/compose/PrincipalList.kt @@ -29,13 +29,13 @@ import org.tasks.R import org.tasks.compose.Constants.HALF_KEYLINE import org.tasks.compose.Constants.ICON_ALPHA import org.tasks.compose.Constants.KEYLINE_FIRST -import org.tasks.data.CaldavCalendar.Companion.INVITE_ACCEPTED -import org.tasks.data.CaldavCalendar.Companion.INVITE_DECLINED -import org.tasks.data.CaldavCalendar.Companion.INVITE_INVALID -import org.tasks.data.CaldavCalendar.Companion.INVITE_NO_RESPONSE -import org.tasks.data.CaldavCalendar.Companion.INVITE_UNKNOWN -import org.tasks.data.Principal -import org.tasks.data.PrincipalAccess +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_ACCEPTED +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_DECLINED +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_INVALID +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_NO_RESPONSE +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_UNKNOWN +import org.tasks.data.entity.Principal +import org.tasks.data.entity.PrincipalAccess import org.tasks.data.PrincipalWithAccess private val principals = listOf( diff --git a/app/src/main/java/org/tasks/compose/StartDateChip.kt b/app/src/main/java/org/tasks/compose/StartDateChip.kt index c7c74c9be..7b55c709f 100644 --- a/app/src/main/java/org/tasks/compose/StartDateChip.kt +++ b/app/src/main/java/org/tasks/compose/StartDateChip.kt @@ -6,7 +6,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import com.todoroo.andlib.utility.DateUtilities -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.tasks.R import org.tasks.date.DateTimeUtils.toDateTime import org.tasks.time.DateTimeUtils.startOfDay diff --git a/app/src/main/java/org/tasks/compose/edit/AlarmRow.kt b/app/src/main/java/org/tasks/compose/edit/AlarmRow.kt index 1486335b9..f6e99aa01 100644 --- a/app/src/main/java/org/tasks/compose/edit/AlarmRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/AlarmRow.kt @@ -31,7 +31,7 @@ import org.tasks.compose.ClearButton import org.tasks.compose.DisabledText import org.tasks.compose.TaskEditRow import org.tasks.compose.collectAsStateLifecycleAware -import org.tasks.data.Alarm +import org.tasks.data.entity.Alarm import org.tasks.reminders.AlarmToString import java.util.Locale diff --git a/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt b/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt index 56dadbe27..3efa3a2e0 100644 --- a/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt @@ -39,7 +39,7 @@ import com.todoroo.andlib.utility.AndroidUtilities import org.tasks.R import org.tasks.compose.DisabledText import org.tasks.compose.TaskEditRow -import org.tasks.data.TaskAttachment +import org.tasks.data.entity.TaskAttachment import org.tasks.files.FileHelper private val SIZE = 128.dp diff --git a/app/src/main/java/org/tasks/compose/edit/CommentsRow.kt b/app/src/main/java/org/tasks/compose/edit/CommentsRow.kt index b35ce0e7c..8e200470d 100644 --- a/app/src/main/java/org/tasks/compose/edit/CommentsRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/CommentsRow.kt @@ -14,7 +14,7 @@ import com.todoroo.andlib.utility.DateUtilities import org.tasks.R import org.tasks.compose.DeleteButton import org.tasks.compose.TaskEditRow -import org.tasks.data.UserActivity +import org.tasks.data.entity.UserActivity import java.util.* @Composable diff --git a/app/src/main/java/org/tasks/compose/edit/LocationRow.kt b/app/src/main/java/org/tasks/compose/edit/LocationRow.kt index 4d2c1bad5..8ca11246d 100644 --- a/app/src/main/java/org/tasks/compose/edit/LocationRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/LocationRow.kt @@ -21,9 +21,9 @@ import com.google.android.material.composethemeadapter.MdcTheme import org.tasks.R import org.tasks.compose.DisabledText import org.tasks.compose.TaskEditRow -import org.tasks.data.Geofence +import org.tasks.data.entity.Geofence import org.tasks.data.Location -import org.tasks.data.Place +import org.tasks.data.entity.Place @Composable fun LocationRow( diff --git a/app/src/main/java/org/tasks/compose/edit/PriorityRow.kt b/app/src/main/java/org/tasks/compose/edit/PriorityRow.kt index 31368ad85..46592ae56 100644 --- a/app/src/main/java/org/tasks/compose/edit/PriorityRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/PriorityRow.kt @@ -26,7 +26,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.google.android.material.composethemeadapter.MdcTheme -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.tasks.R import org.tasks.compose.TaskEditRow import org.tasks.themes.ColorProvider.Companion.priorityColor diff --git a/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt b/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt index 684486aa3..639081245 100644 --- a/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt @@ -42,7 +42,7 @@ import org.tasks.compose.DisabledText import org.tasks.compose.SubtaskChip import org.tasks.compose.TaskEditIcon import org.tasks.compose.TaskEditRow -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.tasks.data.TaskContainer import org.tasks.data.isHidden import org.tasks.tasklist.SectionedDataSource diff --git a/app/src/main/java/org/tasks/compose/edit/TagsRow.kt b/app/src/main/java/org/tasks/compose/edit/TagsRow.kt index 4a889f5bd..e3e61cdc6 100644 --- a/app/src/main/java/org/tasks/compose/edit/TagsRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/TagsRow.kt @@ -13,7 +13,7 @@ import org.tasks.compose.Chip import org.tasks.compose.ChipGroup import org.tasks.compose.DisabledText import org.tasks.compose.TaskEditRow -import org.tasks.data.TagData +import org.tasks.data.entity.TagData import org.tasks.themes.ColorProvider import org.tasks.themes.CustomIcons diff --git a/app/src/main/java/org/tasks/dashclock/DashClockExtension.kt b/app/src/main/java/org/tasks/dashclock/DashClockExtension.kt index 875abdc49..a166ed1ea 100644 --- a/app/src/main/java/org/tasks/dashclock/DashClockExtension.kt +++ b/app/src/main/java/org/tasks/dashclock/DashClockExtension.kt @@ -12,7 +12,7 @@ import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch import org.tasks.LocalBroadcastManager import org.tasks.R -import org.tasks.data.TaskDao +import org.tasks.data.dao.TaskDao import org.tasks.data.count import org.tasks.data.fetchFiltered import org.tasks.intents.TaskIntents diff --git a/app/src/main/java/org/tasks/data/CaldavAccountExtensions.kt b/app/src/main/java/org/tasks/data/CaldavAccountExtensions.kt index ec35f75c0..d55112f91 100644 --- a/app/src/main/java/org/tasks/data/CaldavAccountExtensions.kt +++ b/app/src/main/java/org/tasks/data/CaldavAccountExtensions.kt @@ -10,6 +10,7 @@ import org.tasks.caldav.LocalListSettingsActivity import org.tasks.data.OpenTaskDao.Companion.isDavx5 import org.tasks.data.OpenTaskDao.Companion.isDecSync import org.tasks.data.OpenTaskDao.Companion.isEteSync +import org.tasks.data.entity.CaldavAccount import org.tasks.etebase.EtebaseAccountSettingsActivity import org.tasks.etebase.EtebaseCalendarSettingsActivity import org.tasks.etesync.EteSyncAccountSettingsActivity diff --git a/app/src/main/java/org/tasks/data/CaldavDaoExtensions.kt b/app/src/main/java/org/tasks/data/CaldavDaoExtensions.kt index b90b6bf13..24f509545 100644 --- a/app/src/main/java/org/tasks/data/CaldavDaoExtensions.kt +++ b/app/src/main/java/org/tasks/data/CaldavDaoExtensions.kt @@ -1,10 +1,12 @@ package org.tasks.data import android.content.Context -import com.todoroo.astrid.helper.UUIDHelper import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import org.tasks.R +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar private val mutex = Mutex() diff --git a/app/src/main/java/org/tasks/data/ContentProviderDaoBlocking.kt b/app/src/main/java/org/tasks/data/ContentProviderDaoBlocking.kt index 6027e4561..abebcfc6a 100644 --- a/app/src/main/java/org/tasks/data/ContentProviderDaoBlocking.kt +++ b/app/src/main/java/org/tasks/data/ContentProviderDaoBlocking.kt @@ -2,8 +2,10 @@ package org.tasks.data import android.database.Cursor import androidx.sqlite.db.SupportSQLiteQuery -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import kotlinx.coroutines.runBlocking +import org.tasks.data.dao.ContentProviderDao +import org.tasks.data.entity.TagData import javax.inject.Inject @Deprecated("use coroutines") diff --git a/app/src/main/java/org/tasks/data/LocationDaoExtensions.kt b/app/src/main/java/org/tasks/data/LocationDaoExtensions.kt index 3128037b3..f70b05fd0 100644 --- a/app/src/main/java/org/tasks/data/LocationDaoExtensions.kt +++ b/app/src/main/java/org/tasks/data/LocationDaoExtensions.kt @@ -1,7 +1,10 @@ package org.tasks.data -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.tasks.R +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Geofence +import org.tasks.data.entity.Place import org.tasks.preferences.Preferences suspend fun LocationDao.getLocation(task: Task, preferences: Preferences): Location? { diff --git a/app/src/main/java/org/tasks/data/OpenTaskDao.kt b/app/src/main/java/org/tasks/data/OpenTaskDao.kt index c0b55a587..260499bb3 100644 --- a/app/src/main/java/org/tasks/data/OpenTaskDao.kt +++ b/app/src/main/java/org/tasks/data/OpenTaskDao.kt @@ -13,8 +13,10 @@ import org.dmfs.tasks.contract.TaskContract.* import org.dmfs.tasks.contract.TaskContract.Properties import org.json.JSONObject import org.tasks.R -import org.tasks.data.CaldavAccount.Companion.TYPE_OPENTASKS -import org.tasks.data.CaldavAccount.Companion.openTaskType +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_OPENTASKS +import org.tasks.data.entity.CaldavAccount.Companion.openTaskType +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavCalendar import timber.log.Timber import java.util.* import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/data/PlaceExtensions.kt b/app/src/main/java/org/tasks/data/PlaceExtensions.kt index 846b87a82..aaab96b09 100644 --- a/app/src/main/java/org/tasks/data/PlaceExtensions.kt +++ b/app/src/main/java/org/tasks/data/PlaceExtensions.kt @@ -2,6 +2,7 @@ package org.tasks.data import android.content.Context import android.net.Uri +import org.tasks.data.entity.Place import org.tasks.extensions.Context.openUri import org.tasks.location.MapPosition diff --git a/app/src/main/java/org/tasks/data/TagDataDaoExtensions.kt b/app/src/main/java/org/tasks/data/TagDataDaoExtensions.kt index e839775bd..3d55eccbf 100644 --- a/app/src/main/java/org/tasks/data/TagDataDaoExtensions.kt +++ b/app/src/main/java/org/tasks/data/TagDataDaoExtensions.kt @@ -1,5 +1,7 @@ package org.tasks.data +import org.tasks.data.dao.TagDataDao +import org.tasks.data.entity.TagData import org.tasks.filters.AlphanumComparator suspend fun TagDataDao.searchTags(query: String): List = searchTagsInternal("%$query%").sort() diff --git a/app/src/main/java/org/tasks/data/TaskDaoExtensions.kt b/app/src/main/java/org/tasks/data/TaskDaoExtensions.kt index f3384cd11..d7da1270b 100644 --- a/app/src/main/java/org/tasks/data/TaskDaoExtensions.kt +++ b/app/src/main/java/org/tasks/data/TaskDaoExtensions.kt @@ -1,12 +1,13 @@ package org.tasks.data import androidx.sqlite.db.SimpleSQLiteQuery -import com.todoroo.andlib.sql.Field -import com.todoroo.andlib.sql.Query +import org.tasks.data.sql.Field +import org.tasks.data.sql.Query import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.PermaSql -import com.todoroo.astrid.data.Task -import org.tasks.db.SuspendDbUtils.eachChunk +import org.tasks.data.entity.Task +import org.tasks.data.dao.TaskDao +import org.tasks.data.db.SuspendDbUtils.eachChunk import org.tasks.preferences.QueryPreferences import org.tasks.time.DateTimeUtils2.currentTimeMillis import timber.log.Timber diff --git a/app/src/main/java/org/tasks/data/TaskExtensions.kt b/app/src/main/java/org/tasks/data/TaskExtensions.kt index 4a058ad4b..621820e96 100644 --- a/app/src/main/java/org/tasks/data/TaskExtensions.kt +++ b/app/src/main/java/org/tasks/data/TaskExtensions.kt @@ -1,7 +1,7 @@ package org.tasks.data import com.todoroo.andlib.utility.DateUtilities -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import net.fortuna.ical4j.model.Recur import org.tasks.date.DateTimeUtils import org.tasks.date.DateTimeUtils.toDateTime diff --git a/app/src/main/java/org/tasks/data/TaskListQuery.kt b/app/src/main/java/org/tasks/data/TaskListQuery.kt index 826d9a6f8..522013999 100644 --- a/app/src/main/java/org/tasks/data/TaskListQuery.kt +++ b/app/src/main/java/org/tasks/data/TaskListQuery.kt @@ -1,13 +1,18 @@ package org.tasks.data -import com.todoroo.andlib.sql.Criterion -import com.todoroo.andlib.sql.Field.Companion.field -import com.todoroo.andlib.sql.Join +import org.tasks.data.sql.Criterion +import org.tasks.data.sql.Field.Companion.field +import org.tasks.data.sql.Join import com.todoroo.astrid.api.AstridOrderingFilter import com.todoroo.astrid.api.Filter -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.tasks.data.TaskListQueryNonRecursive.getNonRecursiveQuery import org.tasks.data.TaskListQueryRecursive.getRecursiveQuery +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.entity.CaldavTask +import org.tasks.data.entity.Geofence +import org.tasks.data.entity.Place import org.tasks.preferences.QueryPreferences object TaskListQuery { @@ -17,7 +22,10 @@ object TaskListQuery { field("$CALDAV_METADATA_JOIN.cd_deleted").eq(0)) val JOINS = """ ${Join.left(CaldavTask.TABLE.`as`(CALDAV_METADATA_JOIN), JOIN_CALDAV)} - ${Join.left(CaldavCalendar.TABLE, field("$CALDAV_METADATA_JOIN.cd_calendar").eq(CaldavCalendar.UUID))} + ${ + Join.left( + CaldavCalendar.TABLE, field("$CALDAV_METADATA_JOIN.cd_calendar").eq( + CaldavCalendar.UUID))} ${Join.left(CaldavAccount.TABLE, CaldavCalendar.ACCOUNT.eq(CaldavAccount.UUID))} ${Join.left(Geofence.TABLE, Geofence.TASK.eq(Task.ID))} ${Join.left(Place.TABLE, Place.UID.eq(Geofence.PLACE))} diff --git a/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt b/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt index d968eed1f..9b07fa84f 100644 --- a/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt +++ b/app/src/main/java/org/tasks/data/TaskListQueryNonRecursive.kt @@ -1,13 +1,14 @@ package org.tasks.data -import com.todoroo.andlib.sql.Field.Companion.field -import com.todoroo.andlib.sql.Join -import com.todoroo.andlib.sql.Query +import org.tasks.data.sql.Field.Companion.field +import org.tasks.data.sql.Join +import org.tasks.data.sql.Query import com.todoroo.astrid.api.AstridOrderingFilter import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.PermaSql import com.todoroo.astrid.core.SortHelper -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Tag +import org.tasks.data.entity.Task import org.tasks.filters.RecentlyModifiedFilter import org.tasks.preferences.QueryPreferences diff --git a/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt b/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt index 11db636b3..f65b2a38c 100644 --- a/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt +++ b/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt @@ -1,18 +1,20 @@ package org.tasks.data -import com.todoroo.andlib.data.Table -import com.todoroo.andlib.sql.Criterion -import com.todoroo.andlib.sql.Field.Companion.field -import com.todoroo.andlib.sql.Join -import com.todoroo.andlib.sql.Query -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.db.Table +import org.tasks.data.sql.Criterion +import org.tasks.data.sql.Field.Companion.field +import org.tasks.data.sql.Join +import org.tasks.data.sql.Query +import org.tasks.data.sql.QueryTemplate import com.todoroo.astrid.api.CaldavFilter import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.GtasksFilter import com.todoroo.astrid.api.PermaSql import com.todoroo.astrid.core.SortHelper -import com.todoroo.astrid.data.Task -import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible +import org.tasks.data.entity.Task +import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible +import org.tasks.data.entity.CaldavTask +import org.tasks.data.entity.Tag import org.tasks.preferences.QueryPreferences internal object TaskListQueryRecursive { @@ -20,7 +22,9 @@ internal object TaskListQueryRecursive { private val RECURSIVE_TASK = field("$RECURSIVE.task") private val FIELDS = TaskListQuery.FIELDS.plus(listOf( - field("(${Query.select(field("group_concat(distinct(tag_uid))")).from(Tag.TABLE).where(Task.ID.eq(Tag.TASK))} GROUP BY ${Tag.TASK})").`as`("tags"), + field("(${ + Query.select(field("group_concat(distinct(tag_uid))")).from(Tag.TABLE).where( + Task.ID.eq(Tag.TASK))} GROUP BY ${Tag.TASK})").`as`("tags"), field("indent"), field("sort_group").`as`("sortGroup"), field("children"), @@ -119,7 +123,8 @@ internal object TaskListQueryRecursive { private fun newCaldavQuery(list: String) = QueryTemplate() - .join(Join.inner( + .join( + Join.inner( CaldavTask.TABLE, Criterion.and( CaldavTask.CALENDAR.eq(list), diff --git a/app/src/main/java/org/tasks/db/Migrations.kt b/app/src/main/java/org/tasks/db/Migrations.kt index e97f2dbf9..d9f54a3eb 100644 --- a/app/src/main/java/org/tasks/db/Migrations.kt +++ b/app/src/main/java/org/tasks/db/Migrations.kt @@ -7,20 +7,20 @@ import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase import org.tasks.R import org.tasks.caldav.FileStorage -import org.tasks.data.Alarm.Companion.TYPE_RANDOM -import org.tasks.data.Alarm.Companion.TYPE_REL_END -import org.tasks.data.Alarm.Companion.TYPE_REL_START -import org.tasks.data.Alarm.Companion.TYPE_SNOOZE -import org.tasks.data.CaldavAccount.Companion.SERVER_UNKNOWN -import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS -import org.tasks.data.CaldavCalendar.Companion.ACCESS_OWNER -import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_ONLY +import org.tasks.data.entity.Alarm.Companion.TYPE_RANDOM +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_END +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_START +import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE +import org.tasks.data.entity.CaldavAccount.Companion.SERVER_UNKNOWN +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_OWNER +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_ONLY import org.tasks.data.NO_ORDER import org.tasks.data.OpenTaskDao.Companion.getLong -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.data.Task.Companion.NOTIFY_AFTER_DEADLINE -import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_DEADLINE -import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_START +import org.tasks.data.entity.Task +import org.tasks.data.entity.Task.Companion.NOTIFY_AFTER_DEADLINE +import org.tasks.data.entity.Task.Companion.NOTIFY_AT_DEADLINE +import org.tasks.data.entity.Task.Companion.NOTIFY_AT_START import org.tasks.extensions.getLongOrNull import org.tasks.extensions.getString import org.tasks.preferences.DefaultFilterProvider diff --git a/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt b/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt index 85e3ff909..e2e248f66 100644 --- a/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt +++ b/app/src/main/java/org/tasks/dialogs/DateTimePicker.kt @@ -16,7 +16,7 @@ import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.launch import org.tasks.R -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.tasks.data.createDueDate import org.tasks.databinding.DialogDateTimePickerBinding import org.tasks.date.DateTimeUtils.newDateTime diff --git a/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt b/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt index 435bcda30..c4617833e 100644 --- a/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt +++ b/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt @@ -18,7 +18,7 @@ import kotlinx.coroutines.launch import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.billing.Inventory -import org.tasks.data.CaldavDao +import org.tasks.data.dao.CaldavDao import org.tasks.dialogs.FilterPicker.Companion.EXTRA_LISTS_ONLY import org.tasks.filters.FilterProvider import org.tasks.filters.NavigationDrawerSubheader diff --git a/app/src/main/java/org/tasks/dialogs/GeofenceDialog.java b/app/src/main/java/org/tasks/dialogs/GeofenceDialog.java index 01f45a51b..e6fd5b354 100644 --- a/app/src/main/java/org/tasks/dialogs/GeofenceDialog.java +++ b/app/src/main/java/org/tasks/dialogs/GeofenceDialog.java @@ -17,7 +17,7 @@ import androidx.fragment.app.DialogFragment; import com.google.android.material.switchmaterial.SwitchMaterial; import org.tasks.R; -import org.tasks.data.Geofence; +import org.tasks.data.entity.Geofence; import org.tasks.data.Location; import org.tasks.databinding.LocationDetailsBinding; import org.tasks.preferences.PermissionChecker; diff --git a/app/src/main/java/org/tasks/dialogs/PriorityPicker.kt b/app/src/main/java/org/tasks/dialogs/PriorityPicker.kt index e3e266f9c..14ea5418d 100644 --- a/app/src/main/java/org/tasks/dialogs/PriorityPicker.kt +++ b/app/src/main/java/org/tasks/dialogs/PriorityPicker.kt @@ -7,7 +7,7 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import com.todoroo.astrid.dao.TaskDao -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.launch diff --git a/app/src/main/java/org/tasks/dialogs/PriorityPickerViewModel.kt b/app/src/main/java/org/tasks/dialogs/PriorityPickerViewModel.kt index a6544b66f..2248c71d3 100644 --- a/app/src/main/java/org/tasks/dialogs/PriorityPickerViewModel.kt +++ b/app/src/main/java/org/tasks/dialogs/PriorityPickerViewModel.kt @@ -1,7 +1,7 @@ package org.tasks.dialogs import androidx.lifecycle.ViewModel -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt b/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt index f68bd1ed2..9e7dc52d3 100644 --- a/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt +++ b/app/src/main/java/org/tasks/dialogs/StartDatePicker.kt @@ -10,7 +10,7 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import com.todoroo.andlib.utility.DateUtilities import com.todoroo.astrid.dao.TaskDao -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import dagger.hilt.android.AndroidEntryPoint import org.tasks.R import org.tasks.databinding.DialogStartDatePickerBinding diff --git a/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt b/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt index 90630f06d..d8f9a7200 100644 --- a/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt +++ b/app/src/main/java/org/tasks/etebase/CreateCalendarViewModel.kt @@ -1,7 +1,7 @@ package org.tasks.etebase import dagger.hilt.android.lifecycle.HiltViewModel -import org.tasks.data.CaldavAccount +import org.tasks.data.entity.CaldavAccount import org.tasks.ui.CompletableViewModel import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt b/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt index aea2670cb..8969c3c8a 100644 --- a/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt +++ b/app/src/main/java/org/tasks/etebase/DeleteCalendarViewModel.kt @@ -1,8 +1,8 @@ package org.tasks.etebase import dagger.hilt.android.lifecycle.HiltViewModel -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar import org.tasks.ui.ActionViewModel import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/etebase/EtebaseAccountSettingsActivity.kt b/app/src/main/java/org/tasks/etebase/EtebaseAccountSettingsActivity.kt index ff43cf28b..1afa7b4a8 100644 --- a/app/src/main/java/org/tasks/etebase/EtebaseAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/etebase/EtebaseAccountSettingsActivity.kt @@ -5,13 +5,13 @@ import android.os.Bundle import android.view.View import androidx.activity.viewModels import androidx.appcompat.widget.Toolbar -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.entity.Task +import org.tasks.data.UUIDHelper import dagger.hilt.android.AndroidEntryPoint import org.tasks.R import org.tasks.analytics.Constants import org.tasks.caldav.BaseCaldavAccountSettingsActivity -import org.tasks.data.CaldavAccount +import org.tasks.data.entity.CaldavAccount import org.tasks.data.getPassword import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/etebase/EtebaseCalendarSettingsActivity.kt b/app/src/main/java/org/tasks/etebase/EtebaseCalendarSettingsActivity.kt index 1fa5b770b..5e9ffe722 100644 --- a/app/src/main/java/org/tasks/etebase/EtebaseCalendarSettingsActivity.kt +++ b/app/src/main/java/org/tasks/etebase/EtebaseCalendarSettingsActivity.kt @@ -4,8 +4,8 @@ import android.os.Bundle import androidx.activity.viewModels import dagger.hilt.android.AndroidEntryPoint import org.tasks.caldav.BaseCaldavCalendarSettingsActivity -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar @AndroidEntryPoint class EtebaseCalendarSettingsActivity : BaseCaldavCalendarSettingsActivity() { @@ -25,7 +25,7 @@ class EtebaseCalendarSettingsActivity : BaseCaldavCalendarSettingsActivity() { createCalendarViewModel.createCalendar(caldavAccount, name, color) override suspend fun updateNameAndColor( - account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) = + account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) = updateCalendarViewModel.updateCalendar(account, calendar, name, color) override suspend fun deleteCalendar(caldavAccount: CaldavAccount, caldavCalendar: CaldavCalendar) = diff --git a/app/src/main/java/org/tasks/etebase/EtebaseClient.kt b/app/src/main/java/org/tasks/etebase/EtebaseClient.kt index 1c3784832..e7a1c238e 100644 --- a/app/src/main/java/org/tasks/etebase/EtebaseClient.kt +++ b/app/src/main/java/org/tasks/etebase/EtebaseClient.kt @@ -8,9 +8,9 @@ import com.etebase.client.Item import com.etebase.client.ItemMetadata import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavDao -import org.tasks.data.CaldavTask +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask import org.tasks.time.DateTimeUtils2.currentTimeMillis import timber.log.Timber @@ -47,9 +47,9 @@ class EtebaseClient( } suspend fun fetchItems( - collection: Collection, - calendar: CaldavCalendar, - callback: suspend (Pair>) -> Unit + collection: Collection, + calendar: CaldavCalendar, + callback: suspend (Pair>) -> Unit ) { val itemManager = etebase.collectionManager.getItemManager(collection) var stoken = calendar.ctag diff --git a/app/src/main/java/org/tasks/etebase/EtebaseClientProvider.kt b/app/src/main/java/org/tasks/etebase/EtebaseClientProvider.kt index 47a5532dc..3471ae8ef 100644 --- a/app/src/main/java/org/tasks/etebase/EtebaseClientProvider.kt +++ b/app/src/main/java/org/tasks/etebase/EtebaseClientProvider.kt @@ -7,8 +7,8 @@ import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import okhttp3.OkHttpClient -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.dao.CaldavDao import org.tasks.data.getPassword import org.tasks.http.HttpClientFactory import org.tasks.security.KeyStoreEncryption @@ -18,10 +18,10 @@ import java.util.concurrent.TimeUnit import javax.inject.Inject class EtebaseClientProvider @Inject constructor( - @ApplicationContext private val context: Context, - private val encryption: KeyStoreEncryption, - private val caldavDao: CaldavDao, - private val httpClientFactory: HttpClientFactory, + @ApplicationContext private val context: Context, + private val encryption: KeyStoreEncryption, + private val caldavDao: CaldavDao, + private val httpClientFactory: HttpClientFactory, ) { @Throws(NoSuchAlgorithmException::class, KeyManagementException::class) suspend fun forAccount(account: CaldavAccount): EtebaseClient = forUrl( diff --git a/app/src/main/java/org/tasks/etebase/EtebaseSynchronizer.kt b/app/src/main/java/org/tasks/etebase/EtebaseSynchronizer.kt index c6a1deacf..3d3869a38 100644 --- a/app/src/main/java/org/tasks/etebase/EtebaseSynchronizer.kt +++ b/app/src/main/java/org/tasks/etebase/EtebaseSynchronizer.kt @@ -10,7 +10,7 @@ import com.etebase.client.exceptions.PermissionDeniedException import com.etebase.client.exceptions.ServerErrorException import com.etebase.client.exceptions.TemporaryServerErrorException import com.etebase.client.exceptions.UnauthorizedException -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.UUIDHelper import com.todoroo.astrid.service.TaskDeleter import dagger.hilt.android.qualifiers.ApplicationContext import net.fortuna.ical4j.model.property.ProdId @@ -22,22 +22,22 @@ import org.tasks.billing.Inventory import org.tasks.caldav.VtodoCache import org.tasks.caldav.iCalendar import org.tasks.caldav.iCalendar.Companion.fromVtodo -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao import org.tasks.time.DateTimeUtils2.currentTimeMillis import timber.log.Timber import javax.inject.Inject class EtebaseSynchronizer @Inject constructor( - @param:ApplicationContext private val context: Context, - private val caldavDao: CaldavDao, - private val localBroadcastManager: LocalBroadcastManager, - private val taskDeleter: TaskDeleter, - private val inventory: Inventory, - private val clientProvider: EtebaseClientProvider, - private val iCal: iCalendar, - private val vtodoCache: VtodoCache, + @param:ApplicationContext private val context: Context, + private val caldavDao: CaldavDao, + private val localBroadcastManager: LocalBroadcastManager, + private val taskDeleter: TaskDeleter, + private val inventory: Inventory, + private val clientProvider: EtebaseClientProvider, + private val iCal: iCalendar, + private val vtodoCache: VtodoCache, ) { companion object { init { diff --git a/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt b/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt index 9ddbdc9ab..3585e2cf2 100644 --- a/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt +++ b/app/src/main/java/org/tasks/etebase/UpdateCalendarViewModel.kt @@ -1,8 +1,8 @@ package org.tasks.etebase import dagger.hilt.android.lifecycle.HiltViewModel -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar import org.tasks.ui.CompletableViewModel import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/filters/AlphanumComparator.kt b/app/src/main/java/org/tasks/filters/AlphanumComparator.kt index 624f9aabe..650f44d42 100644 --- a/app/src/main/java/org/tasks/filters/AlphanumComparator.kt +++ b/app/src/main/java/org/tasks/filters/AlphanumComparator.kt @@ -1,7 +1,7 @@ package org.tasks.filters import com.todoroo.astrid.api.Filter -import org.tasks.data.TagData +import org.tasks.data.entity.TagData import java.util.* /* diff --git a/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.kt b/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.kt index 93d497eb1..c9f48f0c2 100644 --- a/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.kt +++ b/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.kt @@ -1,13 +1,13 @@ package org.tasks.filters import android.content.Context -import com.todoroo.andlib.sql.Criterion.Companion.and -import com.todoroo.andlib.sql.Criterion.Companion.exists -import com.todoroo.andlib.sql.Criterion.Companion.or -import com.todoroo.andlib.sql.Field.Companion.field -import com.todoroo.andlib.sql.Join.Companion.inner -import com.todoroo.andlib.sql.Query.Companion.select -import com.todoroo.andlib.sql.UnaryCriterion.Companion.isNotNull +import org.tasks.data.sql.Criterion.Companion.and +import org.tasks.data.sql.Criterion.Companion.exists +import org.tasks.data.sql.Criterion.Companion.or +import org.tasks.data.sql.Field.Companion.field +import org.tasks.data.sql.Join.Companion.inner +import org.tasks.data.sql.Query.Companion.select +import org.tasks.data.sql.UnaryCriterion.Companion.isNotNull import com.todoroo.andlib.utility.AndroidUtilities import com.todoroo.astrid.api.BooleanCriterion import com.todoroo.astrid.api.CustomFilterCriterion @@ -15,29 +15,30 @@ import com.todoroo.astrid.api.MultipleSelectCriterion import com.todoroo.astrid.api.PermaSql import com.todoroo.astrid.api.TextInputCriterion import com.todoroo.astrid.core.CriterionInstance -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 import org.tasks.activities.FilterSettingsActivity.Companion.sql -import org.tasks.data.Alarm -import org.tasks.data.CaldavDao -import org.tasks.data.CaldavTask -import org.tasks.data.Filter +import org.tasks.data.entity.Alarm +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask +import org.tasks.data.entity.Filter import org.tasks.data.GoogleTask -import org.tasks.data.GoogleTaskListDao -import org.tasks.data.Tag -import org.tasks.data.TagData -import org.tasks.data.TagDataDao -import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible +import org.tasks.data.dao.GoogleTaskListDao +import org.tasks.data.entity.Tag +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao +import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible import timber.log.Timber import javax.inject.Inject class FilterCriteriaProvider @Inject constructor( - @param:ApplicationContext private val context: Context, - private val tagDataDao: TagDataDao, - private val googleTaskListDao: GoogleTaskListDao, - private val caldavDao: CaldavDao) { + @param:ApplicationContext private val context: Context, + private val tagDataDao: TagDataDao, + private val googleTaskListDao: GoogleTaskListDao, + private val caldavDao: CaldavDao +) { private val r = context.resources suspend fun rebuildFilter(filter: Filter): Filter { @@ -259,7 +260,8 @@ class FilterCriteriaProvider @Inject constructor( // find tasks that have due dates before the specified // date, or all-day tasks that have due dates before // EOD today if the specified date is NOW - or(Task.DUE_DATE.lte("?"), + or( + Task.DUE_DATE.lte("?"), and(field("${Task.DUE_DATE} / 1000 % 60").eq(0), field("?").eq(field(PermaSql.VALUE_NOW)), Task.DUE_DATE.lte(PermaSql.VALUE_EOD))))) diff --git a/app/src/main/java/org/tasks/filters/FilterProvider.kt b/app/src/main/java/org/tasks/filters/FilterProvider.kt index e4fb13aae..a23556a75 100644 --- a/app/src/main/java/org/tasks/filters/FilterProvider.kt +++ b/app/src/main/java/org/tasks/filters/FilterProvider.kt @@ -14,18 +14,18 @@ import org.tasks.R import org.tasks.activities.GoogleTaskListSettingsActivity import org.tasks.activities.TagSettingsActivity import org.tasks.caldav.BaseCaldavCalendarSettingsActivity -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavAccount.Companion.TYPE_ETESYNC -import org.tasks.data.CaldavAccount.Companion.TYPE_LOCAL -import org.tasks.data.CaldavAccount.Companion.TYPE_OPENTASKS -import org.tasks.data.CaldavDao -import org.tasks.data.FilterDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_ETESYNC +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_LOCAL +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_OPENTASKS +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.FilterDao import org.tasks.data.GoogleTaskFilters -import org.tasks.data.GoogleTaskListDao -import org.tasks.data.LocationDao +import org.tasks.data.dao.GoogleTaskListDao +import org.tasks.data.dao.LocationDao import org.tasks.data.LocationFilters import org.tasks.data.NO_ORDER -import org.tasks.data.TagDataDao +import org.tasks.data.dao.TagDataDao import org.tasks.data.TagFilters import org.tasks.data.listSettingsClass import org.tasks.data.setupLocalAccount @@ -38,14 +38,14 @@ import org.tasks.preferences.Preferences import javax.inject.Inject class FilterProvider @Inject constructor( - @param:ApplicationContext private val context: Context, - private val builtInFilterExposer: BuiltInFilterExposer, - private val filterDao: FilterDao, - private val tagDataDao: TagDataDao, - private val googleTaskListDao: GoogleTaskListDao, - private val caldavDao: CaldavDao, - private val preferences: Preferences, - private val locationDao: LocationDao + @param:ApplicationContext private val context: Context, + private val builtInFilterExposer: BuiltInFilterExposer, + private val filterDao: FilterDao, + private val tagDataDao: TagDataDao, + private val googleTaskListDao: GoogleTaskListDao, + private val caldavDao: CaldavDao, + private val preferences: Preferences, + private val locationDao: LocationDao ) { suspend fun listPickerItems(): List = caldavFilters(false) diff --git a/app/src/main/java/org/tasks/filters/MyTasksFilter.kt b/app/src/main/java/org/tasks/filters/MyTasksFilter.kt index f2efaf717..4468c4558 100644 --- a/app/src/main/java/org/tasks/filters/MyTasksFilter.kt +++ b/app/src/main/java/org/tasks/filters/MyTasksFilter.kt @@ -1,12 +1,12 @@ package org.tasks.filters -import com.todoroo.andlib.sql.Criterion -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Criterion +import org.tasks.data.sql.QueryTemplate import com.todoroo.astrid.api.AstridOrderingFilter import com.todoroo.astrid.api.FilterListItem -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import kotlinx.parcelize.Parcelize -import org.tasks.data.TaskDao +import org.tasks.data.dao.TaskDao import org.tasks.themes.CustomIcons @Parcelize diff --git a/app/src/main/java/org/tasks/filters/NotificationsFilter.kt b/app/src/main/java/org/tasks/filters/NotificationsFilter.kt index 367d438ce..6be26968a 100644 --- a/app/src/main/java/org/tasks/filters/NotificationsFilter.kt +++ b/app/src/main/java/org/tasks/filters/NotificationsFilter.kt @@ -1,13 +1,13 @@ package org.tasks.filters -import com.todoroo.andlib.sql.Join -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Join +import org.tasks.data.sql.QueryTemplate import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.FilterListItem -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import kotlinx.parcelize.Parcelize import org.tasks.R -import org.tasks.data.Notification +import org.tasks.data.entity.Notification @Parcelize data class NotificationsFilter( diff --git a/app/src/main/java/org/tasks/filters/PlaceFilter.kt b/app/src/main/java/org/tasks/filters/PlaceFilter.kt index b4d1169af..7e40229e1 100644 --- a/app/src/main/java/org/tasks/filters/PlaceFilter.kt +++ b/app/src/main/java/org/tasks/filters/PlaceFilter.kt @@ -1,19 +1,19 @@ package org.tasks.filters import android.content.Context -import com.todoroo.andlib.sql.Criterion.Companion.and -import com.todoroo.andlib.sql.Field.Companion.field -import com.todoroo.andlib.sql.Join.Companion.inner -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Criterion.Companion.and +import org.tasks.data.sql.Field.Companion.field +import org.tasks.data.sql.Join.Companion.inner +import org.tasks.data.sql.QueryTemplate import com.todoroo.andlib.utility.AndroidUtilities import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.FilterListItem import kotlinx.parcelize.Parcelize -import org.tasks.data.Geofence +import org.tasks.data.entity.Geofence import org.tasks.data.NO_COUNT -import org.tasks.data.Place -import com.todoroo.astrid.data.Task -import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible +import org.tasks.data.entity.Place +import org.tasks.data.entity.Task +import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible import org.tasks.data.open import org.tasks.themes.CustomIcons diff --git a/app/src/main/java/org/tasks/filters/RecentlyModifiedFilter.kt b/app/src/main/java/org/tasks/filters/RecentlyModifiedFilter.kt index b71dfe245..87f330b0f 100644 --- a/app/src/main/java/org/tasks/filters/RecentlyModifiedFilter.kt +++ b/app/src/main/java/org/tasks/filters/RecentlyModifiedFilter.kt @@ -1,11 +1,11 @@ package org.tasks.filters -import com.todoroo.andlib.sql.Criterion.Companion.and -import com.todoroo.andlib.sql.Order.Companion.desc -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Criterion.Companion.and +import org.tasks.data.sql.Order.Companion.desc +import org.tasks.data.sql.QueryTemplate import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.FilterListItem -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import kotlinx.parcelize.Parcelize import org.tasks.themes.CustomIcons import org.tasks.time.DateTime diff --git a/app/src/main/java/org/tasks/filters/SnoozedFilter.kt b/app/src/main/java/org/tasks/filters/SnoozedFilter.kt index d44e59547..a39956062 100644 --- a/app/src/main/java/org/tasks/filters/SnoozedFilter.kt +++ b/app/src/main/java/org/tasks/filters/SnoozedFilter.kt @@ -1,16 +1,16 @@ package org.tasks.filters -import com.todoroo.andlib.sql.Criterion.Companion.and -import com.todoroo.andlib.sql.Functions.now -import com.todoroo.andlib.sql.Join.Companion.inner -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Criterion.Companion.and +import org.tasks.data.sql.Functions.now +import org.tasks.data.sql.Join.Companion.inner +import org.tasks.data.sql.QueryTemplate import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.FilterListItem -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import kotlinx.parcelize.Parcelize import org.tasks.R -import org.tasks.data.Alarm -import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible +import org.tasks.data.entity.Alarm +import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible @Parcelize data class SnoozedFilter( diff --git a/app/src/main/java/org/tasks/filters/TimerFilter.kt b/app/src/main/java/org/tasks/filters/TimerFilter.kt index 5827f30e1..8605278e1 100644 --- a/app/src/main/java/org/tasks/filters/TimerFilter.kt +++ b/app/src/main/java/org/tasks/filters/TimerFilter.kt @@ -1,10 +1,10 @@ package org.tasks.filters -import com.todoroo.andlib.sql.Criterion -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Criterion +import org.tasks.data.sql.QueryTemplate import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.FilterListItem -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import kotlinx.parcelize.Parcelize import org.tasks.R diff --git a/app/src/main/java/org/tasks/filters/TodayFilter.kt b/app/src/main/java/org/tasks/filters/TodayFilter.kt index c0ce1ccf7..864b023c8 100644 --- a/app/src/main/java/org/tasks/filters/TodayFilter.kt +++ b/app/src/main/java/org/tasks/filters/TodayFilter.kt @@ -1,14 +1,14 @@ package org.tasks.filters -import com.todoroo.andlib.sql.Criterion -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Criterion +import org.tasks.data.sql.QueryTemplate import com.todoroo.andlib.utility.AndroidUtilities import com.todoroo.astrid.api.AstridOrderingFilter import com.todoroo.astrid.api.FilterListItem import com.todoroo.astrid.api.PermaSql -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import kotlinx.parcelize.Parcelize -import org.tasks.data.TaskDao +import org.tasks.data.dao.TaskDao import org.tasks.themes.CustomIcons @Parcelize diff --git a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt index e37ab4625..ff44cd60f 100644 --- a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt +++ b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt @@ -22,6 +22,13 @@ import org.tasks.Strings.isNullOrEmpty import org.tasks.analytics.Firebase import org.tasks.billing.Inventory import org.tasks.data.* +import org.tasks.data.dao.AlarmDao +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.CaldavCalendar +import org.tasks.data.entity.CaldavTask import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.googleapis.InvokerFactory import org.tasks.preferences.DefaultFilterProvider @@ -40,23 +47,23 @@ import javax.net.ssl.SSLException import kotlin.math.max class GoogleTaskSynchronizer @Inject constructor( - @param:ApplicationContext private val context: Context, - private val googleTaskListDao: GoogleTaskListDao, - private val caldavDao: CaldavDao, - private val gtasksListService: GtasksListService, - private val preferences: Preferences, - private val taskDao: TaskDao, - private val firebase: Firebase, - private val googleTaskDao: GoogleTaskDao, - private val taskCreator: TaskCreator, - private val defaultFilterProvider: DefaultFilterProvider, - private val permissionChecker: PermissionChecker, - private val googleAccountManager: GoogleAccountManager, - private val localBroadcastManager: LocalBroadcastManager, - private val inventory: Inventory, - private val taskDeleter: TaskDeleter, - private val invokers: InvokerFactory, - private val alarmDao: AlarmDao, + @param:ApplicationContext private val context: Context, + private val googleTaskListDao: GoogleTaskListDao, + private val caldavDao: CaldavDao, + private val gtasksListService: GtasksListService, + private val preferences: Preferences, + private val taskDao: TaskDao, + private val firebase: Firebase, + private val googleTaskDao: GoogleTaskDao, + private val taskCreator: TaskCreator, + private val defaultFilterProvider: DefaultFilterProvider, + private val permissionChecker: PermissionChecker, + private val googleAccountManager: GoogleAccountManager, + private val localBroadcastManager: LocalBroadcastManager, + private val inventory: Inventory, + private val taskDeleter: TaskDeleter, + private val invokers: InvokerFactory, + private val alarmDao: AlarmDao, ) { suspend fun sync(account: CaldavAccount, i: Int) { Timber.d("%s: start sync", account) @@ -176,7 +183,7 @@ class GoogleTaskSynchronizer @Inject constructor( } @Throws(IOException::class) - private suspend fun pushTask(task: com.todoroo.astrid.data.Task, gtasksInvoker: GtasksInvoker) { + private suspend fun pushTask(task: org.tasks.data.entity.Task, gtasksInvoker: GtasksInvoker) { for (deleted in googleTaskDao.getDeletedByTaskId(task.id)) { deleted.remoteId?.let { try { @@ -307,7 +314,7 @@ class GoogleTaskSynchronizer @Inject constructor( for (gtask in tasks) { val remoteId = gtask.id var googleTask = googleTaskDao.getByRemoteId(remoteId) - var task: com.todoroo.astrid.data.Task? = null + var task: org.tasks.data.entity.Task? = null if (googleTask == null) { googleTask = CaldavTask( task = 0, @@ -347,7 +354,7 @@ class GoogleTaskSynchronizer @Inject constructor( task.title = getTruncatedValue(task.title, gtask.title, MAX_TITLE_LENGTH) task.completionDate = GtasksApiUtilities.gtasksCompletedTimeToUnixTime(gtask.completed?.let(::DateTime)) val dueDate = GtasksApiUtilities.gtasksDueTimeToUnixTime(gtask.due?.let(::DateTime)) - mergeDates(createDueDate(com.todoroo.astrid.data.Task.URGENCY_SPECIFIC_DAY, dueDate), task) + mergeDates(createDueDate(org.tasks.data.entity.Task.URGENCY_SPECIFIC_DAY, dueDate), task) task.notes = getTruncatedValue(task.notes, gtask.notes, MAX_DESCRIPTION_LENGTH) googleTask.calendar = listId if (task.title?.isNotBlank() == true || task.notes?.isNotBlank() == true) { @@ -361,13 +368,13 @@ class GoogleTaskSynchronizer @Inject constructor( ) } - private suspend fun setOrderAndParent(googleTask: CaldavTask, task: Task, local: com.todoroo.astrid.data.Task) { + private suspend fun setOrderAndParent(googleTask: CaldavTask, task: Task, local: org.tasks.data.entity.Task) { task.position?.toLongOrNull()?.let { googleTask.remoteOrder = it } googleTask.remoteParent = task.parent?.takeIf { it.isNotBlank() } local.parent = googleTask.remoteParent?.let { googleTaskDao.getTask(it) } ?: 0L } - private suspend fun write(task: com.todoroo.astrid.data.Task, googleTask: CaldavTask) { + private suspend fun write(task: org.tasks.data.entity.Task, googleTask: CaldavTask) { task.suppressSync() task.suppressRefresh() if (task.isNew) { @@ -401,7 +408,7 @@ class GoogleTaskSynchronizer @Inject constructor( } } - fun mergeDates(remoteDueDate: Long, local: com.todoroo.astrid.data.Task?) { + fun mergeDates(remoteDueDate: Long, local: org.tasks.data.entity.Task?) { if (remoteDueDate > 0 && local!!.hasDueTime()) { val oldDate = newDateTime(local.dueDate) val newDate = newDateTime(remoteDueDate) @@ -409,7 +416,7 @@ class GoogleTaskSynchronizer @Inject constructor( .withMinuteOfHour(oldDate.minuteOfHour) .withSecondOfMinute(oldDate.secondOfMinute) local.setDueDateAdjustingHideUntil( - createDueDate(com.todoroo.astrid.data.Task.URGENCY_SPECIFIC_DAY_TIME, newDate.millis)) + createDueDate(org.tasks.data.entity.Task.URGENCY_SPECIFIC_DAY_TIME, newDate.millis)) } else { local!!.setDueDateAdjustingHideUntil(remoteDueDate) } diff --git a/app/src/main/java/org/tasks/http/HttpClientFactory.kt b/app/src/main/java/org/tasks/http/HttpClientFactory.kt index 0234ddd3a..4ace586d2 100644 --- a/app/src/main/java/org/tasks/http/HttpClientFactory.kt +++ b/app/src/main/java/org/tasks/http/HttpClientFactory.kt @@ -12,7 +12,7 @@ import okhttp3.OkHttpClient import okhttp3.internal.tls.OkHostnameVerifier import org.tasks.DebugNetworkInterceptor import org.tasks.caldav.TasksCookieJar -import org.tasks.data.CaldavAccount +import org.tasks.data.entity.CaldavAccount import org.tasks.extensions.Context.cookiePersistor import org.tasks.preferences.Preferences import org.tasks.security.KeyStoreEncryption diff --git a/app/src/main/java/org/tasks/injection/ApplicationModule.kt b/app/src/main/java/org/tasks/injection/ApplicationModule.kt index c3fdb2717..f908dfc43 100644 --- a/app/src/main/java/org/tasks/injection/ApplicationModule.kt +++ b/app/src/main/java/org/tasks/injection/ApplicationModule.kt @@ -3,7 +3,7 @@ package org.tasks.injection import android.app.NotificationManager import android.content.Context import androidx.appcompat.app.AppCompatDelegate -import com.todoroo.astrid.dao.Database +import org.tasks.data.db.Database import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -16,22 +16,22 @@ import org.tasks.analytics.Firebase import org.tasks.billing.BillingClient import org.tasks.billing.BillingClientImpl import org.tasks.billing.Inventory -import org.tasks.data.AlarmDao -import org.tasks.data.CaldavDao -import org.tasks.data.ContentProviderDao -import org.tasks.data.DeletionDao -import org.tasks.data.FilterDao -import org.tasks.data.GoogleTaskDao -import org.tasks.data.GoogleTaskListDao -import org.tasks.data.LocationDao -import org.tasks.data.TagDao -import org.tasks.data.TagDataDao -import org.tasks.data.TaskAttachmentDao -import org.tasks.data.TaskDao -import org.tasks.data.TaskListMetadataDao -import org.tasks.data.UserActivityDao +import org.tasks.data.dao.AlarmDao +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.ContentProviderDao +import org.tasks.data.dao.DeletionDao +import org.tasks.data.dao.FilterDao +import org.tasks.data.dao.GoogleTaskDao +import org.tasks.data.dao.GoogleTaskListDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.dao.TagDao +import org.tasks.data.dao.TagDataDao +import org.tasks.data.dao.TaskAttachmentDao +import org.tasks.data.dao.TaskDao +import org.tasks.data.dao.TaskListMetadataDao +import org.tasks.data.dao.UserActivityDao import org.tasks.jobs.WorkManager -import org.tasks.data.NotificationDao +import org.tasks.data.dao.NotificationDao import java.util.Locale import javax.inject.Singleton diff --git a/app/src/main/java/org/tasks/injection/ProductionModule.kt b/app/src/main/java/org/tasks/injection/ProductionModule.kt index 17deb610c..fed29ee6a 100644 --- a/app/src/main/java/org/tasks/injection/ProductionModule.kt +++ b/app/src/main/java/org/tasks/injection/ProductionModule.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 @@ -11,7 +11,7 @@ import dagger.hilt.components.SingletonComponent import org.tasks.BuildConfig import org.tasks.R import org.tasks.caldav.FileStorage -import org.tasks.data.CaldavDao +import org.tasks.data.dao.CaldavDao import org.tasks.data.OpenTaskDao import org.tasks.db.Migrations import org.tasks.jobs.WorkManager @@ -48,9 +48,9 @@ internal class ProductionModule { @Provides @Singleton fun getWorkManager( - @ApplicationContext context: Context, - preferences: Preferences, - caldavDao: CaldavDao, - openTaskDao: OpenTaskDao, + @ApplicationContext context: Context, + preferences: Preferences, + caldavDao: CaldavDao, + openTaskDao: OpenTaskDao, ): WorkManager = WorkManagerImpl(context, preferences, caldavDao, openTaskDao) } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/intents/TaskIntents.java b/app/src/main/java/org/tasks/intents/TaskIntents.java index 3cba8f2e2..010ca1b23 100644 --- a/app/src/main/java/org/tasks/intents/TaskIntents.java +++ b/app/src/main/java/org/tasks/intents/TaskIntents.java @@ -6,7 +6,7 @@ import android.content.Intent; import androidx.annotation.Nullable; import com.todoroo.astrid.activity.MainActivity; import com.todoroo.astrid.api.Filter; -import com.todoroo.astrid.data.Task; +import org.tasks.data.entity.Task; public class TaskIntents { diff --git a/app/src/main/java/org/tasks/jobs/AlarmEntry.java b/app/src/main/java/org/tasks/jobs/AlarmEntry.java index 5c321761a..f144b7248 100644 --- a/app/src/main/java/org/tasks/jobs/AlarmEntry.java +++ b/app/src/main/java/org/tasks/jobs/AlarmEntry.java @@ -3,7 +3,7 @@ package org.tasks.jobs; import static org.tasks.time.DateTimeUtils2.currentTimeMillis; import static org.tasks.time.DateTimeUtilsKt.printTimestamp; -import org.tasks.data.Notification; +import org.tasks.data.entity.Notification; import java.util.Objects; diff --git a/app/src/main/java/org/tasks/jobs/MigrateLocalWork.kt b/app/src/main/java/org/tasks/jobs/MigrateLocalWork.kt index edd67f913..1ed084b40 100644 --- a/app/src/main/java/org/tasks/jobs/MigrateLocalWork.kt +++ b/app/src/main/java/org/tasks/jobs/MigrateLocalWork.kt @@ -8,20 +8,20 @@ import dagger.assisted.AssistedInject import org.tasks.R import org.tasks.analytics.Firebase import org.tasks.caldav.CaldavClientProvider -import org.tasks.data.CaldavDao +import org.tasks.data.dao.CaldavDao import org.tasks.injection.BaseWorker import org.tasks.preferences.Preferences import org.tasks.sync.SyncAdapters @HiltWorker class MigrateLocalWork @AssistedInject constructor( - @Assisted context: Context, - @Assisted workerParams: WorkerParameters, - firebase: Firebase, - private val clientProvider: CaldavClientProvider, - private val caldavDao: CaldavDao, - private val preferences: Preferences, - private val syncAdapters: SyncAdapters + @Assisted context: Context, + @Assisted workerParams: WorkerParameters, + firebase: Firebase, + private val clientProvider: CaldavClientProvider, + private val caldavDao: CaldavDao, + private val preferences: Preferences, + private val syncAdapters: SyncAdapters ) : BaseWorker(context, workerParams, firebase) { override suspend fun run(): Result { val uuid = inputData.getString(EXTRA_ACCOUNT) ?: return Result.failure() diff --git a/app/src/main/java/org/tasks/jobs/NotificationWork.kt b/app/src/main/java/org/tasks/jobs/NotificationWork.kt index 752728513..542510984 100644 --- a/app/src/main/java/org/tasks/jobs/NotificationWork.kt +++ b/app/src/main/java/org/tasks/jobs/NotificationWork.kt @@ -11,9 +11,9 @@ import dagger.assisted.AssistedInject import org.tasks.Notifier import org.tasks.R import org.tasks.analytics.Firebase -import org.tasks.data.Alarm.Companion.TYPE_RANDOM -import org.tasks.data.Alarm.Companion.TYPE_SNOOZE -import org.tasks.data.AlarmDao +import org.tasks.data.entity.Alarm.Companion.TYPE_RANDOM +import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE +import org.tasks.data.dao.AlarmDao import org.tasks.date.DateTimeUtils.toDateTime import org.tasks.notifications.NotificationManager import org.tasks.preferences.Preferences diff --git a/app/src/main/java/org/tasks/jobs/RefreshWork.kt b/app/src/main/java/org/tasks/jobs/RefreshWork.kt index 3020a79c8..3c94f4af0 100644 --- a/app/src/main/java/org/tasks/jobs/RefreshWork.kt +++ b/app/src/main/java/org/tasks/jobs/RefreshWork.kt @@ -7,7 +7,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import org.tasks.LocalBroadcastManager import org.tasks.analytics.Firebase -import org.tasks.data.TaskDao +import org.tasks.data.dao.TaskDao import org.tasks.date.DateTimeUtils import kotlin.math.min diff --git a/app/src/main/java/org/tasks/jobs/ReverseGeocodeWork.kt b/app/src/main/java/org/tasks/jobs/ReverseGeocodeWork.kt index 9fcc050b5..7323218c4 100644 --- a/app/src/main/java/org/tasks/jobs/ReverseGeocodeWork.kt +++ b/app/src/main/java/org/tasks/jobs/ReverseGeocodeWork.kt @@ -8,8 +8,8 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import org.tasks.LocalBroadcastManager import org.tasks.analytics.Firebase -import org.tasks.data.LocationDao -import org.tasks.data.Place +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Place import org.tasks.data.mapPosition import org.tasks.injection.BaseWorker import org.tasks.location.Geocoder @@ -22,7 +22,8 @@ class ReverseGeocodeWork @AssistedInject constructor( firebase: Firebase, private val localBroadcastManager: LocalBroadcastManager, private val geocoder: Geocoder, - private val locationDao: LocationDao) : BaseWorker(context, workerParams, firebase) { + private val locationDao: LocationDao +) : BaseWorker(context, workerParams, firebase) { override suspend fun run(): Result { val id = inputData.getLong(PLACE_ID, 0) diff --git a/app/src/main/java/org/tasks/jobs/SyncWork.kt b/app/src/main/java/org/tasks/jobs/SyncWork.kt index a34e282d9..3b8bf55f1 100644 --- a/app/src/main/java/org/tasks/jobs/SyncWork.kt +++ b/app/src/main/java/org/tasks/jobs/SyncWork.kt @@ -22,11 +22,11 @@ import org.tasks.R import org.tasks.analytics.Firebase import org.tasks.billing.Inventory import org.tasks.caldav.CaldavSynchronizer -import org.tasks.data.CaldavAccount.Companion.TYPE_CALDAV -import org.tasks.data.CaldavAccount.Companion.TYPE_ETEBASE -import org.tasks.data.CaldavAccount.Companion.TYPE_TASKS -import org.tasks.data.CaldavDao -import org.tasks.data.GoogleTaskListDao +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_CALDAV +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_ETEBASE +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_TASKS +import org.tasks.data.dao.CaldavDao +import org.tasks.data.dao.GoogleTaskListDao import org.tasks.data.OpenTaskDao import org.tasks.etebase.EtebaseSynchronizer import org.tasks.extensions.Context.hasNetworkConnectivity diff --git a/app/src/main/java/org/tasks/jobs/UpdateCalendarWork.kt b/app/src/main/java/org/tasks/jobs/UpdateCalendarWork.kt index c5d8dcf42..00cf52f5e 100644 --- a/app/src/main/java/org/tasks/jobs/UpdateCalendarWork.kt +++ b/app/src/main/java/org/tasks/jobs/UpdateCalendarWork.kt @@ -8,19 +8,19 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import org.tasks.analytics.Firebase import org.tasks.calendars.CalendarEventProvider -import org.tasks.data.TaskDao +import org.tasks.data.dao.TaskDao import org.tasks.injection.BaseWorker import org.tasks.preferences.PermissionChecker @HiltWorker class UpdateCalendarWork @AssistedInject constructor( - @Assisted context: Context, - @Assisted workerParams: WorkerParameters, - firebase: Firebase, - private val taskDao: TaskDao, - private val gCalHelper: GCalHelper, - private val calendarEventProvider: CalendarEventProvider, - private val permissionChecker: PermissionChecker + @Assisted context: Context, + @Assisted workerParams: WorkerParameters, + firebase: Firebase, + private val taskDao: TaskDao, + private val gCalHelper: GCalHelper, + private val calendarEventProvider: CalendarEventProvider, + private val permissionChecker: PermissionChecker ) : BaseWorker(context, workerParams, firebase) { override suspend fun run(): Result { diff --git a/app/src/main/java/org/tasks/jobs/WorkManager.kt b/app/src/main/java/org/tasks/jobs/WorkManager.kt index fd4fb89d5..091f0cb66 100644 --- a/app/src/main/java/org/tasks/jobs/WorkManager.kt +++ b/app/src/main/java/org/tasks/jobs/WorkManager.kt @@ -1,10 +1,10 @@ package org.tasks.jobs import android.net.Uri -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.tasks.BuildConfig -import org.tasks.data.CaldavAccount -import org.tasks.data.Place +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.Place import org.tasks.time.DateTimeUtils2.currentTimeMillis interface WorkManager { diff --git a/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt b/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt index ae86e88a6..36bda2b2a 100644 --- a/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt +++ b/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt @@ -21,19 +21,19 @@ import androidx.work.Worker import androidx.work.workDataOf import com.todoroo.andlib.utility.AndroidUtilities import com.todoroo.andlib.utility.AndroidUtilities.atLeastS -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.tasks.BuildConfig import org.tasks.R -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavAccount.Companion.TYPE_CALDAV -import org.tasks.data.CaldavAccount.Companion.TYPE_ETEBASE -import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS -import org.tasks.data.CaldavAccount.Companion.TYPE_TASKS -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_CALDAV +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_ETEBASE +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_TASKS +import org.tasks.data.dao.CaldavDao import org.tasks.data.OpenTaskDao -import org.tasks.data.Place +import org.tasks.data.entity.Place import org.tasks.date.DateTimeUtils.midnight import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.jobs.DriveUploader.Companion.EXTRA_PURGE diff --git a/app/src/main/java/org/tasks/locale/receiver/TaskerTaskCreator.kt b/app/src/main/java/org/tasks/locale/receiver/TaskerTaskCreator.kt index 5973d3dfa..d0f3d3f85 100644 --- a/app/src/main/java/org/tasks/locale/receiver/TaskerTaskCreator.kt +++ b/app/src/main/java/org/tasks/locale/receiver/TaskerTaskCreator.kt @@ -1,12 +1,12 @@ package org.tasks.locale.receiver import com.todoroo.astrid.dao.TaskDao -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import com.todoroo.astrid.service.TaskCreator import com.todoroo.astrid.service.TaskCreator.Companion.getDefaultAlarms import org.tasks.Strings.isNullOrEmpty import org.tasks.analytics.Firebase -import org.tasks.data.AlarmDao +import org.tasks.data.dao.AlarmDao import org.tasks.data.createDueDate import org.tasks.locale.bundle.TaskCreationBundle import org.tasks.time.DateTime @@ -20,10 +20,10 @@ import kotlin.math.max import kotlin.math.min class TaskerTaskCreator @Inject internal constructor( - private val taskCreator: TaskCreator, - private val taskDao: TaskDao, - private val firebase: Firebase, - private val alarmDao: AlarmDao, + private val taskCreator: TaskCreator, + private val taskDao: TaskDao, + private val firebase: Firebase, + private val alarmDao: AlarmDao, ) { suspend fun handle(bundle: TaskCreationBundle) { val task = taskCreator.basicQuickAddTask(bundle.title) diff --git a/app/src/main/java/org/tasks/location/AndroidGeofenceTransitionIntentService.kt b/app/src/main/java/org/tasks/location/AndroidGeofenceTransitionIntentService.kt index a6c3e536e..51a785b97 100644 --- a/app/src/main/java/org/tasks/location/AndroidGeofenceTransitionIntentService.kt +++ b/app/src/main/java/org/tasks/location/AndroidGeofenceTransitionIntentService.kt @@ -6,7 +6,7 @@ import android.content.Intent import android.location.LocationManager 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 timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/location/Geocoder.kt b/app/src/main/java/org/tasks/location/Geocoder.kt index 30c70cb51..89682e1b3 100644 --- a/app/src/main/java/org/tasks/location/Geocoder.kt +++ b/app/src/main/java/org/tasks/location/Geocoder.kt @@ -1,6 +1,6 @@ package org.tasks.location -import org.tasks.data.Place +import org.tasks.data.entity.Place interface Geocoder { suspend fun reverseGeocode(mapPosition: MapPosition): Place? diff --git a/app/src/main/java/org/tasks/location/GeocoderMapbox.kt b/app/src/main/java/org/tasks/location/GeocoderMapbox.kt index 4b97aac84..5a078126d 100644 --- a/app/src/main/java/org/tasks/location/GeocoderMapbox.kt +++ b/app/src/main/java/org/tasks/location/GeocoderMapbox.kt @@ -11,7 +11,7 @@ import okhttp3.OkHttpClient import okhttp3.Request import org.tasks.DebugNetworkInterceptor import org.tasks.R -import org.tasks.data.Place +import org.tasks.data.entity.Place import org.tasks.extensions.JsonObject.getStringOrNull import org.tasks.preferences.Preferences import java.io.IOException diff --git a/app/src/main/java/org/tasks/location/GeocoderNominatim.kt b/app/src/main/java/org/tasks/location/GeocoderNominatim.kt index f8c51b9d6..e386427c9 100644 --- a/app/src/main/java/org/tasks/location/GeocoderNominatim.kt +++ b/app/src/main/java/org/tasks/location/GeocoderNominatim.kt @@ -9,7 +9,7 @@ import kotlinx.coroutines.withContext import okhttp3.Request import org.tasks.BuildConfig import org.tasks.R -import org.tasks.data.Place +import org.tasks.data.entity.Place import org.tasks.extensions.JsonObject.getOrNull import org.tasks.extensions.JsonObject.getStringOrNull import org.tasks.http.HttpClientFactory diff --git a/app/src/main/java/org/tasks/location/GeofenceApi.kt b/app/src/main/java/org/tasks/location/GeofenceApi.kt index b9a78a477..fbe7b61aa 100644 --- a/app/src/main/java/org/tasks/location/GeofenceApi.kt +++ b/app/src/main/java/org/tasks/location/GeofenceApi.kt @@ -1,15 +1,15 @@ package org.tasks.location -import org.tasks.data.LocationDao -import org.tasks.data.Place +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Place import org.tasks.preferences.PermissionChecker import timber.log.Timber import javax.inject.Inject class GeofenceApi @Inject constructor( - private val permissionChecker: PermissionChecker, - private val locationDao: LocationDao, - private val locationService: LocationService + private val permissionChecker: PermissionChecker, + private val locationDao: LocationDao, + private val locationService: LocationService ) { suspend fun registerAll() = locationDao.getPlacesWithGeofences().forEach { update(it) } diff --git a/app/src/main/java/org/tasks/location/LocationPickerActivity.kt b/app/src/main/java/org/tasks/location/LocationPickerActivity.kt index 31284b74e..5c4a3615e 100644 --- a/app/src/main/java/org/tasks/location/LocationPickerActivity.kt +++ b/app/src/main/java/org/tasks/location/LocationPickerActivity.kt @@ -32,8 +32,8 @@ import org.tasks.activities.PlaceSettingsActivity import org.tasks.analytics.Firebase import org.tasks.billing.Inventory import org.tasks.caldav.GeoUtils.toLikeString -import org.tasks.data.LocationDao -import org.tasks.data.Place +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Place import org.tasks.data.PlaceUsage import org.tasks.data.mapPosition import org.tasks.databinding.ActivityLocationPickerBinding diff --git a/app/src/main/java/org/tasks/location/LocationPickerAdapter.java b/app/src/main/java/org/tasks/location/LocationPickerAdapter.java index 0081001cd..580eaf8bb 100644 --- a/app/src/main/java/org/tasks/location/LocationPickerAdapter.java +++ b/app/src/main/java/org/tasks/location/LocationPickerAdapter.java @@ -15,7 +15,7 @@ import androidx.recyclerview.widget.ListAdapter; import androidx.recyclerview.widget.RecyclerView; import org.tasks.R; import org.tasks.billing.Inventory; -import org.tasks.data.Place; +import org.tasks.data.entity.Place; import org.tasks.data.PlaceUsage; import org.tasks.location.LocationPickerAdapter.PlaceViewHolder; import org.tasks.themes.ColorProvider; diff --git a/app/src/main/java/org/tasks/location/LocationService.kt b/app/src/main/java/org/tasks/location/LocationService.kt index b9f641f81..92d91a7c6 100644 --- a/app/src/main/java/org/tasks/location/LocationService.kt +++ b/app/src/main/java/org/tasks/location/LocationService.kt @@ -1,7 +1,7 @@ package org.tasks.location import org.tasks.data.MergedGeofence -import org.tasks.data.Place +import org.tasks.data.entity.Place interface LocationService { suspend fun currentLocation(): MapPosition? diff --git a/app/src/main/java/org/tasks/location/LocationServiceAndroid.kt b/app/src/main/java/org/tasks/location/LocationServiceAndroid.kt index d55a92279..f6a58963e 100644 --- a/app/src/main/java/org/tasks/location/LocationServiceAndroid.kt +++ b/app/src/main/java/org/tasks/location/LocationServiceAndroid.kt @@ -9,7 +9,7 @@ import android.net.Uri import com.todoroo.andlib.utility.AndroidUtilities.atLeastS import dagger.hilt.android.qualifiers.ApplicationContext import org.tasks.data.MergedGeofence -import org.tasks.data.Place +import org.tasks.data.entity.Place import org.tasks.preferences.PermissionChecker import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/location/MapFragment.kt b/app/src/main/java/org/tasks/location/MapFragment.kt index d8d19ce44..79a45592e 100644 --- a/app/src/main/java/org/tasks/location/MapFragment.kt +++ b/app/src/main/java/org/tasks/location/MapFragment.kt @@ -1,7 +1,7 @@ package org.tasks.location import androidx.appcompat.app.AppCompatActivity -import org.tasks.data.Place +import org.tasks.data.entity.Place interface MapFragment { fun init(activity: AppCompatActivity, callback: MapFragmentCallback, dark: Boolean) diff --git a/app/src/main/java/org/tasks/location/OsmMapFragment.kt b/app/src/main/java/org/tasks/location/OsmMapFragment.kt index ca2befc74..399846851 100644 --- a/app/src/main/java/org/tasks/location/OsmMapFragment.kt +++ b/app/src/main/java/org/tasks/location/OsmMapFragment.kt @@ -19,7 +19,7 @@ import org.osmdroid.views.overlay.TilesOverlay import org.osmdroid.views.overlay.mylocation.GpsMyLocationProvider import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay 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 diff --git a/app/src/main/java/org/tasks/location/PlaceSearch.kt b/app/src/main/java/org/tasks/location/PlaceSearch.kt index d029e061c..a5269258d 100644 --- a/app/src/main/java/org/tasks/location/PlaceSearch.kt +++ b/app/src/main/java/org/tasks/location/PlaceSearch.kt @@ -2,7 +2,7 @@ package org.tasks.location import android.os.Bundle import androidx.annotation.DrawableRes -import org.tasks.data.Place +import org.tasks.data.entity.Place interface PlaceSearch { fun restoreState(savedInstanceState: Bundle?) diff --git a/app/src/main/java/org/tasks/location/PlaceSearchGoogle.kt b/app/src/main/java/org/tasks/location/PlaceSearchGoogle.kt index b9fdf8d4f..baef8700e 100644 --- a/app/src/main/java/org/tasks/location/PlaceSearchGoogle.kt +++ b/app/src/main/java/org/tasks/location/PlaceSearchGoogle.kt @@ -9,9 +9,9 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import okhttp3.Request import org.tasks.R -import org.tasks.data.CaldavAccount.Companion.TYPE_TASKS -import org.tasks.data.CaldavDao -import org.tasks.data.Place +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_TASKS +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.Place import org.tasks.http.HttpClientFactory import org.tasks.http.HttpException import timber.log.Timber diff --git a/app/src/main/java/org/tasks/location/PlaceSearchMapbox.kt b/app/src/main/java/org/tasks/location/PlaceSearchMapbox.kt index 2f7807f13..13f1158af 100644 --- a/app/src/main/java/org/tasks/location/PlaceSearchMapbox.kt +++ b/app/src/main/java/org/tasks/location/PlaceSearchMapbox.kt @@ -10,7 +10,7 @@ import okhttp3.OkHttpClient import okhttp3.Request import org.tasks.DebugNetworkInterceptor import org.tasks.R -import org.tasks.data.Place +import org.tasks.data.entity.Place import org.tasks.location.GeocoderMapbox.Companion.toPlace import org.tasks.preferences.Preferences import java.io.IOException diff --git a/app/src/main/java/org/tasks/location/PlaceSearchResult.java b/app/src/main/java/org/tasks/location/PlaceSearchResult.java index 11466f4ec..206667802 100644 --- a/app/src/main/java/org/tasks/location/PlaceSearchResult.java +++ b/app/src/main/java/org/tasks/location/PlaceSearchResult.java @@ -1,7 +1,7 @@ package org.tasks.location; import java.util.Objects; -import org.tasks.data.Place; +import org.tasks.data.entity.Place; public class PlaceSearchResult { diff --git a/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt b/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt index 1d3005217..be9b5d3b5 100644 --- a/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt +++ b/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt @@ -5,7 +5,7 @@ import androidx.lifecycle.* import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import org.tasks.Event -import org.tasks.data.Place +import org.tasks.data.entity.Place import javax.inject.Inject @HiltViewModel @@ -17,10 +17,10 @@ class PlaceSearchViewModel @Inject constructor( private val selection = MutableLiveData() fun observe( - owner: LifecycleOwner?, - onResults: Observer>?, - onSelection: Observer?, - onError: Observer>?) { + owner: LifecycleOwner?, + onResults: Observer>?, + onSelection: Observer?, + onError: Observer>?) { searchResults.observe(owner!!, onResults!!) selection.observe(owner, onSelection!!) error.observe(owner, onError!!) diff --git a/app/src/main/java/org/tasks/notifications/NotificationManager.kt b/app/src/main/java/org/tasks/notifications/NotificationManager.kt index 31795efeb..346392890 100644 --- a/app/src/main/java/org/tasks/notifications/NotificationManager.kt +++ b/app/src/main/java/org/tasks/notifications/NotificationManager.kt @@ -12,11 +12,11 @@ import com.todoroo.astrid.utility.Constants import dagger.hilt.android.qualifiers.ApplicationContext import org.tasks.LocalBroadcastManager import org.tasks.R -import org.tasks.data.Alarm -import org.tasks.data.LocationDao -import org.tasks.data.Notification -import org.tasks.data.NotificationDao -import org.tasks.data.TaskDao +import org.tasks.data.entity.Alarm +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Notification +import org.tasks.data.dao.NotificationDao +import org.tasks.data.dao.TaskDao import org.tasks.intents.TaskIntents import org.tasks.markdown.MarkdownProvider import org.tasks.preferences.PermissionChecker diff --git a/app/src/main/java/org/tasks/opentasks/OpenTasksListSettingsActivity.kt b/app/src/main/java/org/tasks/opentasks/OpenTasksListSettingsActivity.kt index fd0fd56e6..62449ebf8 100644 --- a/app/src/main/java/org/tasks/opentasks/OpenTasksListSettingsActivity.kt +++ b/app/src/main/java/org/tasks/opentasks/OpenTasksListSettingsActivity.kt @@ -5,8 +5,8 @@ import android.view.View import dagger.hilt.android.AndroidEntryPoint import org.tasks.R import org.tasks.caldav.BaseCaldavCalendarSettingsActivity -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar @AndroidEntryPoint class OpenTasksListSettingsActivity : BaseCaldavCalendarSettingsActivity() { @@ -22,7 +22,7 @@ class OpenTasksListSettingsActivity : BaseCaldavCalendarSettingsActivity() { override suspend fun createCalendar(caldavAccount: CaldavAccount, name: String, color: Int) {} override suspend fun updateNameAndColor( - account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) = + account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) = updateCalendar() override suspend fun deleteCalendar(caldavAccount: CaldavAccount, caldavCalendar: CaldavCalendar) {} diff --git a/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt b/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt index 87ada3c0b..07dff9a58 100644 --- a/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt +++ b/app/src/main/java/org/tasks/opentasks/OpenTasksSynchronizer.kt @@ -3,8 +3,8 @@ package org.tasks.opentasks import android.content.Context import at.bitfire.ical4android.BatchOperation import com.todoroo.astrid.dao.TaskDao -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.data.Task.Companion.NO_ID +import org.tasks.data.entity.Task +import org.tasks.data.entity.Task.Companion.NO_ID import com.todoroo.astrid.service.TaskDeleter import dagger.hilt.android.qualifiers.ApplicationContext import org.dmfs.tasks.contract.TaskContract @@ -15,10 +15,10 @@ import org.tasks.analytics.Constants import org.tasks.analytics.Firebase import org.tasks.billing.Inventory import org.tasks.caldav.iCalendar -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavDao -import org.tasks.data.CaldavTask +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask import org.tasks.data.MyAndroidTask import org.tasks.data.OpenTaskDao import org.tasks.data.OpenTaskDao.Companion.filterActive @@ -32,15 +32,15 @@ import javax.inject.Singleton @Singleton class OpenTasksSynchronizer @Inject constructor( - @ApplicationContext private val context: Context, - private val caldavDao: CaldavDao, - private val taskDeleter: TaskDeleter, - private val localBroadcastManager: LocalBroadcastManager, - private val taskDao: TaskDao, - private val firebase: Firebase, - private val iCalendar: iCalendar, - private val openTaskDao: OpenTaskDao, - private val inventory: Inventory) { + @ApplicationContext private val context: Context, + private val caldavDao: CaldavDao, + private val taskDeleter: TaskDeleter, + private val localBroadcastManager: LocalBroadcastManager, + private val taskDao: TaskDao, + private val firebase: Firebase, + private val iCalendar: iCalendar, + private val openTaskDao: OpenTaskDao, + private val inventory: Inventory) { suspend fun sync() { val lists = openTaskDao.getListsByAccount().filterActive(caldavDao) diff --git a/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt b/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt index dfc11bd01..cb906968d 100644 --- a/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt +++ b/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt @@ -12,16 +12,16 @@ import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.runBlocking import org.tasks.R import org.tasks.Strings.isNullOrEmpty -import org.tasks.data.CaldavCalendar.Companion.ACCESS_READ_ONLY -import org.tasks.data.CaldavDao -import org.tasks.data.CaldavTask -import org.tasks.data.FilterDao +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_ONLY +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask +import org.tasks.data.dao.FilterDao import org.tasks.data.GoogleTask -import org.tasks.data.GoogleTaskDao -import org.tasks.data.GoogleTaskListDao -import org.tasks.data.LocationDao -import org.tasks.data.TagDataDao -import com.todoroo.astrid.data.Task +import org.tasks.data.dao.GoogleTaskDao +import org.tasks.data.dao.GoogleTaskListDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.dao.TagDataDao +import org.tasks.data.entity.Task import org.tasks.data.getLocalList import org.tasks.filters.PlaceFilter import timber.log.Timber @@ -29,14 +29,15 @@ import javax.inject.Inject class DefaultFilterProvider @Inject constructor( // TODO: don't inject context, it breaks built-in filters when overriding language - @param:ApplicationContext private val context: Context, - private val preferences: Preferences, - private val filterDao: FilterDao, - private val tagDataDao: TagDataDao, - private val googleTaskListDao: GoogleTaskListDao, - private val caldavDao: CaldavDao, - private val locationDao: LocationDao, - private val googleTaskDao: GoogleTaskDao) { + @param:ApplicationContext private val context: Context, + private val preferences: Preferences, + private val filterDao: FilterDao, + private val tagDataDao: TagDataDao, + private val googleTaskListDao: GoogleTaskListDao, + private val caldavDao: CaldavDao, + private val locationDao: LocationDao, + private val googleTaskDao: GoogleTaskDao +) { var dashclockFilter: Filter @Deprecated("use coroutines") get() = runBlocking { getFilterFromPreference(R.string.p_dashclock_filter) } diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt index 15e7b8e80..d2fd1dc15 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.kt +++ b/app/src/main/java/org/tasks/preferences/Preferences.kt @@ -17,14 +17,14 @@ import com.todoroo.andlib.utility.AndroidUtilities import com.todoroo.andlib.utility.DateUtilities import com.todoroo.astrid.activity.BeastModePreferences import com.todoroo.astrid.core.SortHelper -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.data.Task.Companion.NOTIFY_AFTER_DEADLINE -import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_DEADLINE +import org.tasks.data.entity.Task +import org.tasks.data.entity.Task.Companion.NOTIFY_AFTER_DEADLINE +import org.tasks.data.entity.Task.Companion.NOTIFY_AT_DEADLINE import org.tasks.BuildConfig import org.tasks.R import org.tasks.Strings.isNullOrEmpty import org.tasks.billing.Purchase -import org.tasks.data.TaskAttachment +import org.tasks.data.entity.TaskAttachment import org.tasks.extensions.Context.getResourceUri import org.tasks.themes.ColorProvider import org.tasks.themes.ThemeBase diff --git a/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt b/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt index a00d38c82..0b9c967a4 100644 --- a/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt +++ b/app/src/main/java/org/tasks/preferences/PreferencesViewModel.kt @@ -14,8 +14,8 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.tasks.R import org.tasks.backup.BackupConstants -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.dao.CaldavDao import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.googleapis.InvokerFactory import org.tasks.gtasks.GoogleAccountManager @@ -25,11 +25,11 @@ import javax.inject.Inject @HiltViewModel class PreferencesViewModel @Inject constructor( - @ApplicationContext private val context: Context, - private val preferences: Preferences, - invokers: InvokerFactory, - private val googleAccountManager: GoogleAccountManager, - caldavDao: CaldavDao, + @ApplicationContext private val context: Context, + private val preferences: Preferences, + invokers: InvokerFactory, + private val googleAccountManager: GoogleAccountManager, + caldavDao: CaldavDao, ) : ViewModel() { private val driveInvoker = invokers.getDriveInvoker() val lastBackup = MutableLiveData() diff --git a/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt b/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt index 3efe5bf8f..f73e0189a 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt @@ -4,13 +4,13 @@ import android.app.Activity import android.content.Intent import android.os.Bundle import androidx.lifecycle.lifecycleScope -import com.todoroo.astrid.dao.Database +import org.tasks.data.db.Database import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch import org.tasks.R import org.tasks.caldav.VtodoCache import org.tasks.calendars.CalendarEventProvider -import org.tasks.data.TaskDao +import org.tasks.data.dao.TaskDao import org.tasks.etebase.EtebaseLocalCache import org.tasks.extensions.Context.toast import org.tasks.files.FileHelper diff --git a/app/src/main/java/org/tasks/preferences/fragments/GoogleTasksAccount.kt b/app/src/main/java/org/tasks/preferences/fragments/GoogleTasksAccount.kt index 520de4998..b029ea841 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/GoogleTasksAccount.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/GoogleTasksAccount.kt @@ -13,9 +13,9 @@ import kotlinx.coroutines.launch import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.billing.Inventory -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavAccount.Companion.isPaymentRequired -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.isPaymentRequired +import org.tasks.data.dao.CaldavDao import org.tasks.preferences.IconPreference import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt b/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt index 3a9562d10..314976bfd 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt @@ -21,7 +21,7 @@ import org.tasks.billing.Purchase import org.tasks.billing.PurchaseActivity import org.tasks.caldav.BaseCaldavAccountSettingsActivity import org.tasks.caldav.CaldavAccountSettingsActivity -import org.tasks.data.CaldavAccount +import org.tasks.data.entity.CaldavAccount import org.tasks.data.accountSettingsClass import org.tasks.data.prefIcon import org.tasks.data.prefTitle diff --git a/app/src/main/java/org/tasks/preferences/fragments/MicrosoftAccount.kt b/app/src/main/java/org/tasks/preferences/fragments/MicrosoftAccount.kt index ce0d37f47..fc8887588 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/MicrosoftAccount.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/MicrosoftAccount.kt @@ -13,9 +13,9 @@ import kotlinx.coroutines.launch import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.billing.Inventory -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavAccount.Companion.isPaymentRequired -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.isPaymentRequired +import org.tasks.data.dao.CaldavDao import org.tasks.preferences.IconPreference import org.tasks.sync.microsoft.MicrosoftSignInViewModel import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/preferences/fragments/TaskDefaults.kt b/app/src/main/java/org/tasks/preferences/fragments/TaskDefaults.kt index 776c25edb..f32adbbc1 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/TaskDefaults.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/TaskDefaults.kt @@ -6,20 +6,20 @@ import android.os.Bundle import android.view.View import androidx.lifecycle.lifecycleScope import androidx.preference.Preference -import com.todoroo.astrid.data.Task.Companion.NOTIFY_AFTER_DEADLINE -import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_DEADLINE -import com.todoroo.astrid.data.Task.Companion.NOTIFY_AT_START +import org.tasks.data.entity.Task.Companion.NOTIFY_AFTER_DEADLINE +import org.tasks.data.entity.Task.Companion.NOTIFY_AT_DEADLINE +import org.tasks.data.entity.Task.Companion.NOTIFY_AT_START import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch import org.tasks.R import org.tasks.calendars.CalendarPicker import org.tasks.calendars.CalendarPicker.Companion.newCalendarPicker import org.tasks.calendars.CalendarProvider -import org.tasks.data.CaldavAccount -import org.tasks.data.LocationDao -import org.tasks.data.Place -import org.tasks.data.TagData -import org.tasks.data.TagDataDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Place +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao import org.tasks.dialogs.FilterPicker.Companion.newFilterPicker import org.tasks.dialogs.FilterPicker.Companion.setFilterPickerResultListener import org.tasks.injection.InjectingPreferenceFragment diff --git a/app/src/main/java/org/tasks/preferences/fragments/TasksAccount.kt b/app/src/main/java/org/tasks/preferences/fragments/TasksAccount.kt index c337ce352..c6d80dc99 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/TasksAccount.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/TasksAccount.kt @@ -28,9 +28,9 @@ import org.tasks.auth.SignInActivity import org.tasks.auth.SignInActivity.Platform import org.tasks.billing.Inventory import org.tasks.billing.Purchase -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavAccount.Companion.isPaymentRequired -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.isPaymentRequired +import org.tasks.data.dao.CaldavDao import org.tasks.extensions.Context.openUri import org.tasks.extensions.Context.toast import org.tasks.jobs.WorkManager diff --git a/app/src/main/java/org/tasks/preferences/fragments/TasksAccountViewModel.kt b/app/src/main/java/org/tasks/preferences/fragments/TasksAccountViewModel.kt index fecaa2779..e47aea43d 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/TasksAccountViewModel.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/TasksAccountViewModel.kt @@ -7,7 +7,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import org.json.JSONObject import org.tasks.caldav.CaldavClientProvider -import org.tasks.data.CaldavAccount +import org.tasks.data.entity.CaldavAccount import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/provider/TasksContentProvider.kt b/app/src/main/java/org/tasks/provider/TasksContentProvider.kt index 296be16eb..4feb23c5f 100644 --- a/app/src/main/java/org/tasks/provider/TasksContentProvider.kt +++ b/app/src/main/java/org/tasks/provider/TasksContentProvider.kt @@ -6,7 +6,7 @@ import android.content.UriMatcher import android.database.Cursor import android.net.Uri import androidx.sqlite.db.SupportSQLiteQueryBuilder -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import dagger.hilt.EntryPoint import dagger.hilt.InstallIn import dagger.hilt.android.EntryPointAccessors diff --git a/app/src/main/java/org/tasks/receivers/RefreshReceiver.kt b/app/src/main/java/org/tasks/receivers/RefreshReceiver.kt index 6955315a7..794181246 100644 --- a/app/src/main/java/org/tasks/receivers/RefreshReceiver.kt +++ b/app/src/main/java/org/tasks/receivers/RefreshReceiver.kt @@ -6,7 +6,7 @@ import com.todoroo.astrid.provider.Astrid2TaskProvider import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.qualifiers.ApplicationContext import org.tasks.R -import org.tasks.data.TaskDao +import org.tasks.data.dao.TaskDao import org.tasks.data.count import org.tasks.injection.InjectingJobIntentService import org.tasks.preferences.DefaultFilterProvider diff --git a/app/src/main/java/org/tasks/reminders/AlarmToString.kt b/app/src/main/java/org/tasks/reminders/AlarmToString.kt index 1d9662018..246445ed2 100644 --- a/app/src/main/java/org/tasks/reminders/AlarmToString.kt +++ b/app/src/main/java/org/tasks/reminders/AlarmToString.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.res.Resources import com.todoroo.andlib.utility.DateUtilities import org.tasks.R -import org.tasks.data.Alarm +import org.tasks.data.entity.Alarm import java.util.Locale import java.util.concurrent.TimeUnit import kotlin.math.absoluteValue diff --git a/app/src/main/java/org/tasks/reminders/NotificationActivity.kt b/app/src/main/java/org/tasks/reminders/NotificationActivity.kt index 48ba51d13..3d5b1b3c8 100644 --- a/app/src/main/java/org/tasks/reminders/NotificationActivity.kt +++ b/app/src/main/java/org/tasks/reminders/NotificationActivity.kt @@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch -import org.tasks.data.TaskDao +import org.tasks.data.dao.TaskDao import org.tasks.intents.TaskIntents import org.tasks.notifications.NotificationManager import org.tasks.receivers.CompleteTaskReceiver diff --git a/app/src/main/java/org/tasks/repeats/CustomRecurrenceViewModel.kt b/app/src/main/java/org/tasks/repeats/CustomRecurrenceViewModel.kt index c3a2f844b..a2baabeb3 100644 --- a/app/src/main/java/org/tasks/repeats/CustomRecurrenceViewModel.kt +++ b/app/src/main/java/org/tasks/repeats/CustomRecurrenceViewModel.kt @@ -17,7 +17,7 @@ import net.fortuna.ical4j.model.Recur.Frequency.YEARLY import net.fortuna.ical4j.model.WeekDay import net.fortuna.ical4j.model.WeekDayList import net.fortuna.ical4j.model.property.RRule -import org.tasks.data.CaldavAccount.Companion.TYPE_MICROSOFT +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_MICROSOFT import org.tasks.date.DateTimeUtils.toDateTime import org.tasks.repeats.CustomRecurrenceActivity.Companion.EXTRA_ACCOUNT_TYPE import org.tasks.repeats.CustomRecurrenceActivity.Companion.EXTRA_DATE diff --git a/app/src/main/java/org/tasks/repeats/RecurrenceUtils.kt b/app/src/main/java/org/tasks/repeats/RecurrenceUtils.kt index c8aab11ce..0dc1264e5 100644 --- a/app/src/main/java/org/tasks/repeats/RecurrenceUtils.kt +++ b/app/src/main/java/org/tasks/repeats/RecurrenceUtils.kt @@ -1,6 +1,6 @@ package org.tasks.repeats -import com.todoroo.astrid.data.Task.Companion.sanitizeRecur +import org.tasks.data.entity.Task.Companion.sanitizeRecur import net.fortuna.ical4j.model.Recur import net.fortuna.ical4j.model.property.RRule diff --git a/app/src/main/java/org/tasks/sync/SyncAdapters.kt b/app/src/main/java/org/tasks/sync/SyncAdapters.kt index b5e295179..1bcec6483 100644 --- a/app/src/main/java/org/tasks/sync/SyncAdapters.kt +++ b/app/src/main/java/org/tasks/sync/SyncAdapters.kt @@ -7,17 +7,17 @@ import kotlinx.coroutines.async import kotlinx.coroutines.launch import org.tasks.LocalBroadcastManager import org.tasks.R -import org.tasks.data.CaldavAccount.Companion.TYPE_CALDAV -import org.tasks.data.CaldavAccount.Companion.TYPE_ETEBASE -import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS -import org.tasks.data.CaldavAccount.Companion.TYPE_OPENTASKS -import org.tasks.data.CaldavAccount.Companion.TYPE_TASKS -import org.tasks.data.CaldavDao -import com.todoroo.astrid.data.FORCE_CALDAV_SYNC -import org.tasks.data.GoogleTaskDao +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_CALDAV +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_ETEBASE +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_OPENTASKS +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_TASKS +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.FORCE_CALDAV_SYNC +import org.tasks.data.dao.GoogleTaskDao import org.tasks.data.OpenTaskDao -import com.todoroo.astrid.data.SUPPRESS_SYNC -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.SUPPRESS_SYNC +import org.tasks.data.entity.Task import org.tasks.jobs.WorkManager import org.tasks.jobs.WorkManager.Companion.TAG_SYNC import org.tasks.preferences.Preferences @@ -27,12 +27,12 @@ import javax.inject.Singleton @Singleton class SyncAdapters @Inject constructor( - workManager: WorkManager, - private val caldavDao: CaldavDao, - private val googleTaskDao: GoogleTaskDao, - private val openTaskDao: OpenTaskDao, - private val preferences: Preferences, - private val localBroadcastManager: LocalBroadcastManager + workManager: WorkManager, + private val caldavDao: CaldavDao, + private val googleTaskDao: GoogleTaskDao, + private val openTaskDao: OpenTaskDao, + private val preferences: Preferences, + private val localBroadcastManager: LocalBroadcastManager ) { private val scope = CoroutineScope(newSingleThreadExecutor().asCoroutineDispatcher() + SupervisorJob()) private val sync = Debouncer(TAG_SYNC) { workManager.sync(it) } diff --git a/app/src/main/java/org/tasks/sync/microsoft/MicrosoftConverter.kt b/app/src/main/java/org/tasks/sync/microsoft/MicrosoftConverter.kt index 70eb2f4a8..9e83e3512 100644 --- a/app/src/main/java/org/tasks/sync/microsoft/MicrosoftConverter.kt +++ b/app/src/main/java/org/tasks/sync/microsoft/MicrosoftConverter.kt @@ -1,11 +1,11 @@ package org.tasks.sync.microsoft -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import net.fortuna.ical4j.model.Recur import net.fortuna.ical4j.model.WeekDay import net.fortuna.ical4j.model.WeekDayList -import org.tasks.data.CaldavTask -import org.tasks.data.TagData +import org.tasks.data.entity.CaldavTask +import org.tasks.data.entity.TagData import org.tasks.sync.microsoft.Tasks.Task.RecurrenceDayOfWeek import org.tasks.sync.microsoft.Tasks.Task.RecurrenceType import org.tasks.time.DateTime diff --git a/app/src/main/java/org/tasks/sync/microsoft/MicrosoftListSettingsActivity.kt b/app/src/main/java/org/tasks/sync/microsoft/MicrosoftListSettingsActivity.kt index c40496040..76dffafe3 100644 --- a/app/src/main/java/org/tasks/sync/microsoft/MicrosoftListSettingsActivity.kt +++ b/app/src/main/java/org/tasks/sync/microsoft/MicrosoftListSettingsActivity.kt @@ -10,8 +10,8 @@ import com.todoroo.astrid.activity.TaskListFragment import com.todoroo.astrid.api.CaldavFilter import dagger.hilt.android.AndroidEntryPoint import org.tasks.caldav.BaseCaldavCalendarSettingsActivity -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar @AndroidEntryPoint class MicrosoftListSettingsActivity : BaseCaldavCalendarSettingsActivity() { diff --git a/app/src/main/java/org/tasks/sync/microsoft/MicrosoftListSettingsActivityViewModel.kt b/app/src/main/java/org/tasks/sync/microsoft/MicrosoftListSettingsActivityViewModel.kt index f3d326a24..521b2f28d 100644 --- a/app/src/main/java/org/tasks/sync/microsoft/MicrosoftListSettingsActivityViewModel.kt +++ b/app/src/main/java/org/tasks/sync/microsoft/MicrosoftListSettingsActivityViewModel.kt @@ -10,9 +10,9 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import okhttp3.RequestBody.Companion.toRequestBody import org.tasks.caldav.BaseCaldavCalendarSettingsActivity -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavDao +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao import org.tasks.http.HttpClientFactory import org.tasks.http.HttpClientFactory.Companion.MEDIA_TYPE_JSON import retrofit2.HttpException diff --git a/app/src/main/java/org/tasks/sync/microsoft/TaskLists.kt b/app/src/main/java/org/tasks/sync/microsoft/TaskLists.kt index bb187cf53..90bef36da 100644 --- a/app/src/main/java/org/tasks/sync/microsoft/TaskLists.kt +++ b/app/src/main/java/org/tasks/sync/microsoft/TaskLists.kt @@ -1,7 +1,7 @@ package org.tasks.sync.microsoft import com.squareup.moshi.Json -import org.tasks.data.CaldavCalendar +import org.tasks.data.entity.CaldavCalendar data class TaskLists( @field:Json(name = "@odata.context") val context: String, diff --git a/app/src/main/java/org/tasks/tags/TagPickerActivity.kt b/app/src/main/java/org/tasks/tags/TagPickerActivity.kt index 3bc683e09..2b91e8ca3 100644 --- a/app/src/main/java/org/tasks/tags/TagPickerActivity.kt +++ b/app/src/main/java/org/tasks/tags/TagPickerActivity.kt @@ -41,7 +41,7 @@ import kotlinx.coroutines.launch import org.tasks.R import org.tasks.Strings import org.tasks.billing.Inventory -import org.tasks.data.TagData +import org.tasks.data.entity.TagData import org.tasks.extensions.addBackPressedCallback import org.tasks.injection.ThemedInjectingAppCompatActivity import org.tasks.themes.ColorProvider diff --git a/app/src/main/java/org/tasks/tags/TagPickerViewModel.kt b/app/src/main/java/org/tasks/tags/TagPickerViewModel.kt index 3f728913d..d1efcefef 100644 --- a/app/src/main/java/org/tasks/tags/TagPickerViewModel.kt +++ b/app/src/main/java/org/tasks/tags/TagPickerViewModel.kt @@ -9,8 +9,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch -import org.tasks.data.TagData -import org.tasks.data.TagDataDao +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao import org.tasks.data.searchTags import javax.inject.Inject diff --git a/app/src/main/java/org/tasks/tasklist/HeaderFormatter.kt b/app/src/main/java/org/tasks/tasklist/HeaderFormatter.kt index d02d36d21..6881c22e2 100644 --- a/app/src/main/java/org/tasks/tasklist/HeaderFormatter.kt +++ b/app/src/main/java/org/tasks/tasklist/HeaderFormatter.kt @@ -7,7 +7,7 @@ import com.todoroo.astrid.core.SortHelper import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.runBlocking import org.tasks.R -import org.tasks.data.CaldavDao +import org.tasks.data.dao.CaldavDao import org.tasks.preferences.Preferences import java.time.format.FormatStyle import java.util.Locale diff --git a/app/src/main/java/org/tasks/themes/ColorProvider.kt b/app/src/main/java/org/tasks/themes/ColorProvider.kt index 21ac4ce91..a2b45a11a 100644 --- a/app/src/main/java/org/tasks/themes/ColorProvider.kt +++ b/app/src/main/java/org/tasks/themes/ColorProvider.kt @@ -2,7 +2,7 @@ package org.tasks.themes import android.content.Context import androidx.annotation.ColorInt -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.preferences.Preferences diff --git a/app/src/main/java/org/tasks/time/DateTime.java b/app/src/main/java/org/tasks/time/DateTime.java index 9c8aea9b9..aa95c198a 100644 --- a/app/src/main/java/org/tasks/time/DateTime.java +++ b/app/src/main/java/org/tasks/time/DateTime.java @@ -11,7 +11,7 @@ import static java.util.Calendar.WEDNESDAY; import net.fortuna.ical4j.model.WeekDay; -import org.tasks.data.CaldavDao; +import org.tasks.data.dao.CaldavDao; import java.text.SimpleDateFormat; import java.time.LocalDate; diff --git a/app/src/main/java/org/tasks/ui/CheckBoxProvider.kt b/app/src/main/java/org/tasks/ui/CheckBoxProvider.kt index 9de23b6a2..132f9ae85 100644 --- a/app/src/main/java/org/tasks/ui/CheckBoxProvider.kt +++ b/app/src/main/java/org/tasks/ui/CheckBoxProvider.kt @@ -4,7 +4,7 @@ import android.content.Context import android.graphics.drawable.Drawable import androidx.annotation.DrawableRes import androidx.appcompat.content.res.AppCompatResources -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import dagger.hilt.android.qualifiers.ActivityContext import org.tasks.R import org.tasks.themes.ColorProvider diff --git a/app/src/main/java/org/tasks/ui/ChipListCache.kt b/app/src/main/java/org/tasks/ui/ChipListCache.kt index 43919188f..c708e7b84 100644 --- a/app/src/main/java/org/tasks/ui/ChipListCache.kt +++ b/app/src/main/java/org/tasks/ui/ChipListCache.kt @@ -2,18 +2,18 @@ package org.tasks.ui import com.todoroo.astrid.api.TagFilter import org.tasks.LocalBroadcastManager -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavDao -import org.tasks.data.TagData -import org.tasks.data.TagDataDao +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao import javax.inject.Inject import javax.inject.Singleton @Singleton class ChipListCache @Inject internal constructor( - caldavDao: CaldavDao, - tagDataDao: TagDataDao, - private val localBroadcastManager: LocalBroadcastManager) { + caldavDao: CaldavDao, + tagDataDao: TagDataDao, + private val localBroadcastManager: LocalBroadcastManager) { private val caldavCalendars: MutableMap = HashMap() private val tagDatas: MutableMap = HashMap() diff --git a/app/src/main/java/org/tasks/ui/LocationControlSet.kt b/app/src/main/java/org/tasks/ui/LocationControlSet.kt index 2b895d17d..a08d896bf 100644 --- a/app/src/main/java/org/tasks/ui/LocationControlSet.kt +++ b/app/src/main/java/org/tasks/ui/LocationControlSet.kt @@ -16,9 +16,9 @@ import org.tasks.R import org.tasks.Strings.isNullOrEmpty import org.tasks.compose.collectAsStateLifecycleAware import org.tasks.compose.edit.LocationRow -import org.tasks.data.Geofence +import org.tasks.data.entity.Geofence import org.tasks.data.Location -import org.tasks.data.Place +import org.tasks.data.entity.Place import org.tasks.data.createGeofence import org.tasks.data.open import org.tasks.dialogs.DialogBuilder diff --git a/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt b/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt index 79d4485e9..c49c1f2bf 100644 --- a/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt +++ b/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt @@ -9,12 +9,12 @@ import androidx.fragment.app.activityViewModels import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import com.google.android.material.composethemeadapter.MdcTheme -import com.todoroo.andlib.sql.Criterion -import com.todoroo.andlib.sql.QueryTemplate +import org.tasks.data.sql.Criterion +import org.tasks.data.sql.QueryTemplate import com.todoroo.astrid.activity.MainActivityViewModel import com.todoroo.astrid.api.FilterImpl import com.todoroo.astrid.dao.TaskDao -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import com.todoroo.astrid.service.TaskCompleter import com.todoroo.astrid.service.TaskCreator import dagger.hilt.android.AndroidEntryPoint @@ -22,8 +22,8 @@ import kotlinx.coroutines.launch import org.tasks.R import org.tasks.compose.collectAsStateLifecycleAware import org.tasks.compose.edit.SubtaskRow -import org.tasks.data.GoogleTaskDao -import org.tasks.data.TaskDao.TaskCriteria.activeAndVisible +import org.tasks.data.dao.GoogleTaskDao +import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible import org.tasks.preferences.Preferences import org.tasks.tasklist.SectionedDataSource import org.tasks.themes.ColorProvider diff --git a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt index ccc584dfa..da5a60cbc 100644 --- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt +++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt @@ -13,11 +13,11 @@ import com.todoroo.astrid.api.CaldavFilter import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.GtasksFilter import com.todoroo.astrid.dao.TaskDao -import com.todoroo.astrid.data.FORCE_CALDAV_SYNC -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.data.Task.Companion.NOTIFY_MODE_FIVE -import com.todoroo.astrid.data.Task.Companion.NOTIFY_MODE_NONSTOP -import com.todoroo.astrid.data.Task.Companion.hasDueTime +import org.tasks.data.entity.FORCE_CALDAV_SYNC +import org.tasks.data.entity.Task +import org.tasks.data.entity.Task.Companion.NOTIFY_MODE_FIVE +import org.tasks.data.entity.Task.Companion.NOTIFY_MODE_NONSTOP +import org.tasks.data.entity.Task.Companion.hasDueTime import com.todoroo.astrid.gcal.GCalHelper import com.todoroo.astrid.service.TaskCompleter import com.todoroo.astrid.service.TaskCreator.Companion.getDefaultAlarms @@ -36,23 +36,23 @@ import org.tasks.R import org.tasks.Strings import org.tasks.analytics.Firebase import org.tasks.calendars.CalendarEventProvider -import org.tasks.data.Alarm -import org.tasks.data.Alarm.Companion.TYPE_REL_END -import org.tasks.data.Alarm.Companion.TYPE_REL_START -import org.tasks.data.AlarmDao -import org.tasks.data.Attachment -import org.tasks.data.CaldavDao -import org.tasks.data.CaldavTask -import org.tasks.data.GoogleTaskDao +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_END +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_START +import org.tasks.data.dao.AlarmDao +import org.tasks.data.entity.Attachment +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask +import org.tasks.data.dao.GoogleTaskDao import org.tasks.data.Location -import org.tasks.data.LocationDao -import org.tasks.data.TagDao -import org.tasks.data.TagData -import org.tasks.data.TagDataDao -import org.tasks.data.TaskAttachment -import org.tasks.data.TaskAttachmentDao -import org.tasks.data.UserActivity -import org.tasks.data.UserActivityDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.dao.TagDao +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao +import org.tasks.data.entity.TaskAttachment +import org.tasks.data.dao.TaskAttachmentDao +import org.tasks.data.entity.UserActivity +import org.tasks.data.dao.UserActivityDao import org.tasks.data.createDueDate import org.tasks.date.DateTimeUtils.toDateTime import org.tasks.files.FileHelper @@ -66,30 +66,30 @@ import javax.inject.Inject @HiltViewModel class TaskEditViewModel @Inject constructor( - @ApplicationContext private val context: Context, - savedStateHandle: SavedStateHandle, - private val taskDao: TaskDao, - private val taskDeleter: TaskDeleter, - private val timerPlugin: TimerPlugin, - private val permissionChecker: PermissionChecker, - private val calendarEventProvider: CalendarEventProvider, - private val gCalHelper: GCalHelper, - private val taskMover: TaskMover, - private val locationDao: LocationDao, - private val geofenceApi: GeofenceApi, - private val tagDao: TagDao, - private val tagDataDao: TagDataDao, - private val preferences: Preferences, - private val googleTaskDao: GoogleTaskDao, - private val caldavDao: CaldavDao, - private val taskCompleter: TaskCompleter, - private val alarmService: AlarmService, - private val taskListEvents: TaskListEventBus, - private val mainActivityEvents: MainActivityEventBus, - private val firebase: Firebase? = null, - private val userActivityDao: UserActivityDao, - private val alarmDao: AlarmDao, - private val taskAttachmentDao: TaskAttachmentDao, + @ApplicationContext private val context: Context, + savedStateHandle: SavedStateHandle, + private val taskDao: TaskDao, + private val taskDeleter: TaskDeleter, + private val timerPlugin: TimerPlugin, + private val permissionChecker: PermissionChecker, + private val calendarEventProvider: CalendarEventProvider, + private val gCalHelper: GCalHelper, + private val taskMover: TaskMover, + private val locationDao: LocationDao, + private val geofenceApi: GeofenceApi, + private val tagDao: TagDao, + private val tagDataDao: TagDataDao, + private val preferences: Preferences, + private val googleTaskDao: GoogleTaskDao, + private val caldavDao: CaldavDao, + private val taskCompleter: TaskCompleter, + private val alarmService: AlarmService, + private val taskListEvents: TaskListEventBus, + private val mainActivityEvents: MainActivityEventBus, + private val firebase: Firebase? = null, + private val userActivityDao: UserActivityDao, + private val alarmDao: AlarmDao, + private val taskAttachmentDao: TaskAttachmentDao, ) : ViewModel() { private val resources = context.resources private var cleared = false diff --git a/app/src/main/java/org/tasks/ui/TaskListViewModel.kt b/app/src/main/java/org/tasks/ui/TaskListViewModel.kt index 04f65e8d4..fd1f907d4 100644 --- a/app/src/main/java/org/tasks/ui/TaskListViewModel.kt +++ b/app/src/main/java/org/tasks/ui/TaskListViewModel.kt @@ -30,10 +30,10 @@ import org.tasks.R import org.tasks.analytics.Firebase import org.tasks.billing.Inventory import org.tasks.compose.throttleLatest -import org.tasks.data.DeletionDao -import com.todoroo.astrid.data.Task +import org.tasks.data.dao.DeletionDao +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.TaskListQuery.getQuery import org.tasks.data.fetchTasks import org.tasks.db.QueryUtils diff --git a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt index 2f8b349c4..dc42247e6 100644 --- a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt +++ b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt @@ -9,7 +9,7 @@ import androidx.core.content.pm.ShortcutManagerCompat import androidx.core.graphics.drawable.IconCompat import com.google.android.material.textfield.TextInputEditText import com.todoroo.astrid.api.Filter -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.UUIDHelper import dagger.hilt.android.AndroidEntryPoint import org.tasks.R import org.tasks.Strings.isNullOrEmpty diff --git a/app/src/main/java/org/tasks/widget/TasksWidgetAdapter.kt b/app/src/main/java/org/tasks/widget/TasksWidgetAdapter.kt index af8215786..66c1fcfba 100644 --- a/app/src/main/java/org/tasks/widget/TasksWidgetAdapter.kt +++ b/app/src/main/java/org/tasks/widget/TasksWidgetAdapter.kt @@ -8,7 +8,7 @@ import com.todoroo.astrid.subtasks.SubtasksHelper import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.runBlocking -import org.tasks.data.TaskDao +import org.tasks.data.dao.TaskDao import org.tasks.markdown.MarkdownProvider import org.tasks.preferences.DefaultFilterProvider import org.tasks.preferences.Preferences diff --git a/app/src/main/java/org/tasks/widget/TasksWidgetViewFactory.kt b/app/src/main/java/org/tasks/widget/TasksWidgetViewFactory.kt index 5c504e0c1..2a8eb3cd7 100644 --- a/app/src/main/java/org/tasks/widget/TasksWidgetViewFactory.kt +++ b/app/src/main/java/org/tasks/widget/TasksWidgetViewFactory.kt @@ -14,7 +14,7 @@ import kotlinx.coroutines.runBlocking import org.tasks.BuildConfig import org.tasks.R import org.tasks.data.TaskContainer -import org.tasks.data.TaskDao +import org.tasks.data.dao.TaskDao import org.tasks.data.TaskListQuery.getQuery import org.tasks.data.hasNotes import org.tasks.data.isHidden diff --git a/app/src/main/java/org/tasks/widget/WidgetChipProvider.kt b/app/src/main/java/org/tasks/widget/WidgetChipProvider.kt index 3f2213d47..444aa7a2f 100644 --- a/app/src/main/java/org/tasks/widget/WidgetChipProvider.kt +++ b/app/src/main/java/org/tasks/widget/WidgetChipProvider.kt @@ -11,7 +11,7 @@ import com.todoroo.astrid.api.TagFilter import dagger.hilt.android.qualifiers.ApplicationContext import org.tasks.BuildConfig import org.tasks.R -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.tasks.data.TaskContainer import org.tasks.data.isHidden import org.tasks.date.DateTimeUtils.toDateTime diff --git a/app/src/main/java/org/tasks/widget/WidgetClickActivity.kt b/app/src/main/java/org/tasks/widget/WidgetClickActivity.kt index 36efe8988..2ea1fec4b 100644 --- a/app/src/main/java/org/tasks/widget/WidgetClickActivity.kt +++ b/app/src/main/java/org/tasks/widget/WidgetClickActivity.kt @@ -4,7 +4,7 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import com.todoroo.astrid.dao.TaskDao -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import com.todoroo.astrid.service.TaskCompleter import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.NonCancellable diff --git a/app/src/test/java/com/todoroo/astrid/alarms/AlarmCalculatorTest.kt b/app/src/test/java/com/todoroo/astrid/alarms/AlarmCalculatorTest.kt index 22fccceba..100418aea 100644 --- a/app/src/test/java/com/todoroo/astrid/alarms/AlarmCalculatorTest.kt +++ b/app/src/test/java/com/todoroo/astrid/alarms/AlarmCalculatorTest.kt @@ -2,24 +2,24 @@ package com.todoroo.astrid.alarms import com.natpryce.makeiteasy.MakeItEasy.with import com.todoroo.andlib.utility.DateUtilities.ONE_WEEK -import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL_DUE -import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL_DUE_TIME -import com.todoroo.astrid.data.Task.Companion.URGENCY_SPECIFIC_DAY_TIME +import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_DUE +import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_DUE_TIME +import org.tasks.data.entity.Task.Companion.URGENCY_SPECIFIC_DAY_TIME import kotlinx.coroutines.runBlocking import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Before import org.junit.Test import org.tasks.Freeze.Companion.freezeAt -import org.tasks.data.Alarm -import org.tasks.data.Alarm.Companion.TYPE_DATE_TIME -import org.tasks.data.Alarm.Companion.TYPE_RANDOM -import org.tasks.data.Alarm.Companion.TYPE_REL_END -import org.tasks.data.Alarm.Companion.TYPE_REL_START -import org.tasks.data.Alarm.Companion.TYPE_SNOOZE -import org.tasks.data.Alarm.Companion.whenDue -import org.tasks.data.Alarm.Companion.whenOverdue -import org.tasks.data.Alarm.Companion.whenStarted +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_DATE_TIME +import org.tasks.data.entity.Alarm.Companion.TYPE_RANDOM +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_END +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_START +import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE +import org.tasks.data.entity.Alarm.Companion.whenDue +import org.tasks.data.entity.Alarm.Companion.whenOverdue +import org.tasks.data.entity.Alarm.Companion.whenStarted import org.tasks.data.createDueDate import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.date.DateTimeUtils.toDateTime diff --git a/app/src/test/java/com/todoroo/astrid/data/TaskTest.kt b/app/src/test/java/com/todoroo/astrid/data/TaskTest.kt index 9b401cec2..2dbf25a88 100644 --- a/app/src/test/java/com/todoroo/astrid/data/TaskTest.kt +++ b/app/src/test/java/com/todoroo/astrid/data/TaskTest.kt @@ -9,6 +9,7 @@ import org.junit.Test import org.tasks.Freeze import org.tasks.Freeze.Companion.freezeAt import org.tasks.data.createDueDate +import org.tasks.data.entity.Task import org.tasks.data.isHidden import org.tasks.data.isOverdue import org.tasks.date.DateTimeUtils diff --git a/app/src/test/java/com/todoroo/astrid/repeats/RepeatTests.kt b/app/src/test/java/com/todoroo/astrid/repeats/RepeatTests.kt index 64fdda100..cccf811b4 100644 --- a/app/src/test/java/com/todoroo/astrid/repeats/RepeatTests.kt +++ b/app/src/test/java/com/todoroo/astrid/repeats/RepeatTests.kt @@ -4,7 +4,7 @@ import com.natpryce.makeiteasy.MakeItEasy import com.natpryce.makeiteasy.PropertyValue 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 kotlinx.coroutines.runBlocking import org.junit.Before diff --git a/app/src/test/java/org/tasks/TestUtilities.kt b/app/src/test/java/org/tasks/TestUtilities.kt index 53787a308..20567ed6e 100644 --- a/app/src/test/java/org/tasks/TestUtilities.kt +++ b/app/src/test/java/org/tasks/TestUtilities.kt @@ -3,12 +3,12 @@ package org.tasks import android.content.Context import at.bitfire.ical4android.Task.Companion.tasksFromReader import com.squareup.moshi.Moshi -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import kotlinx.coroutines.runBlocking import org.tasks.caldav.applyRemote import org.tasks.caldav.iCalendar.Companion.reminders -import org.tasks.data.Alarm -import org.tasks.data.CaldavTask +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.CaldavTask import org.tasks.preferences.Preferences import org.tasks.sync.microsoft.MicrosoftConverter.applyRemote import org.tasks.sync.microsoft.Tasks diff --git a/app/src/test/java/org/tasks/caldav/AppleRemindersTests.kt b/app/src/test/java/org/tasks/caldav/AppleRemindersTests.kt index 8dc1acd3f..391f5d10b 100644 --- a/app/src/test/java/org/tasks/caldav/AppleRemindersTests.kt +++ b/app/src/test/java/org/tasks/caldav/AppleRemindersTests.kt @@ -1,6 +1,6 @@ package org.tasks.caldav -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue @@ -8,8 +8,8 @@ import org.junit.Before import org.junit.Test import org.tasks.TestUtilities.alarms import org.tasks.TestUtilities.vtodo -import org.tasks.data.Alarm -import org.tasks.data.Alarm.Companion.TYPE_DATE_TIME +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_DATE_TIME import org.tasks.time.DateTime import java.util.* diff --git a/app/src/test/java/org/tasks/caldav/NextCloudTests.kt b/app/src/test/java/org/tasks/caldav/NextCloudTests.kt index 3980a4d12..ab9bc7388 100644 --- a/app/src/test/java/org/tasks/caldav/NextCloudTests.kt +++ b/app/src/test/java/org/tasks/caldav/NextCloudTests.kt @@ -1,6 +1,6 @@ package org.tasks.caldav -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.junit.After import org.junit.Assert.assertEquals import org.junit.Before diff --git a/app/src/test/java/org/tasks/caldav/ThunderbirdTests.kt b/app/src/test/java/org/tasks/caldav/ThunderbirdTests.kt index 6171d72f1..cc387fa48 100644 --- a/app/src/test/java/org/tasks/caldav/ThunderbirdTests.kt +++ b/app/src/test/java/org/tasks/caldav/ThunderbirdTests.kt @@ -1,6 +1,6 @@ package org.tasks.caldav -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.junit.After import org.junit.Assert.assertEquals import org.junit.Before @@ -10,10 +10,10 @@ import org.tasks.TestUtilities.alarms import org.tasks.TestUtilities.setup import org.tasks.TestUtilities.vtodo import org.tasks.caldav.iCalendar.Companion.applyLocal -import org.tasks.data.Alarm -import org.tasks.data.Alarm.Companion.TYPE_DATE_TIME -import org.tasks.data.Alarm.Companion.TYPE_REL_END -import org.tasks.data.Alarm.Companion.TYPE_REL_START +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_DATE_TIME +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_END +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_START import org.tasks.time.DateTime import java.util.* import java.util.concurrent.TimeUnit diff --git a/app/src/test/java/org/tasks/caldav/extensions/VAlarmTests.kt b/app/src/test/java/org/tasks/caldav/extensions/VAlarmTests.kt index 5115d5af3..4d39e03ac 100644 --- a/app/src/test/java/org/tasks/caldav/extensions/VAlarmTests.kt +++ b/app/src/test/java/org/tasks/caldav/extensions/VAlarmTests.kt @@ -2,10 +2,10 @@ package org.tasks.caldav.extensions import org.junit.Assert.assertEquals import org.junit.Test -import org.tasks.data.Alarm -import org.tasks.data.Alarm.Companion.TYPE_DATE_TIME -import org.tasks.data.Alarm.Companion.TYPE_REL_END -import org.tasks.data.Alarm.Companion.TYPE_REL_START +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_DATE_TIME +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_END +import org.tasks.data.entity.Alarm.Companion.TYPE_REL_START import org.tasks.time.DateTime import org.tasks.time.DateTime.UTC import java.util.concurrent.TimeUnit.HOURS diff --git a/app/src/test/java/org/tasks/caldav/iCalendarMergeTest.kt b/app/src/test/java/org/tasks/caldav/iCalendarMergeTest.kt index 3030df682..60d8a91b1 100644 --- a/app/src/test/java/org/tasks/caldav/iCalendarMergeTest.kt +++ b/app/src/test/java/org/tasks/caldav/iCalendarMergeTest.kt @@ -3,10 +3,10 @@ package org.tasks.caldav import com.natpryce.makeiteasy.MakeItEasy.with -import com.todoroo.astrid.data.Task.Companion.URGENCY_SPECIFIC_DAY -import com.todoroo.astrid.data.Task.Priority.Companion.HIGH -import com.todoroo.astrid.data.Task.Priority.Companion.LOW -import com.todoroo.astrid.data.Task.Priority.Companion.MEDIUM +import org.tasks.data.entity.Task.Companion.URGENCY_SPECIFIC_DAY +import org.tasks.data.entity.Task.Priority.Companion.HIGH +import org.tasks.data.entity.Task.Priority.Companion.LOW +import org.tasks.data.entity.Task.Priority.Companion.MEDIUM import net.fortuna.ical4j.model.property.Status import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/app/src/test/java/org/tasks/data/PrincipalTest.kt b/app/src/test/java/org/tasks/data/PrincipalTest.kt index bbaf74f18..d183537a5 100644 --- a/app/src/test/java/org/tasks/data/PrincipalTest.kt +++ b/app/src/test/java/org/tasks/data/PrincipalTest.kt @@ -2,6 +2,7 @@ package org.tasks.data import org.junit.Assert.assertEquals import org.junit.Test +import org.tasks.data.entity.Principal class PrincipalTest { @Test diff --git a/app/src/test/java/org/tasks/db/QueryUtilsTest.kt b/app/src/test/java/org/tasks/db/QueryUtilsTest.kt index f97e61957..e356598ee 100644 --- a/app/src/test/java/org/tasks/db/QueryUtilsTest.kt +++ b/app/src/test/java/org/tasks/db/QueryUtilsTest.kt @@ -1,7 +1,7 @@ package org.tasks.db -import com.todoroo.andlib.sql.Functions -import com.todoroo.astrid.data.Task +import org.tasks.data.sql.Functions +import org.tasks.data.entity.Task import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/org/tasks/makers/AlarmEntryMaker.kt b/app/src/test/java/org/tasks/makers/AlarmEntryMaker.kt index da3def28d..9077e1d93 100644 --- a/app/src/test/java/org/tasks/makers/AlarmEntryMaker.kt +++ b/app/src/test/java/org/tasks/makers/AlarmEntryMaker.kt @@ -5,7 +5,7 @@ import com.natpryce.makeiteasy.Property import com.natpryce.makeiteasy.Property.newProperty import com.natpryce.makeiteasy.PropertyLookup import com.natpryce.makeiteasy.PropertyValue -import org.tasks.data.Alarm.Companion.TYPE_DATE_TIME +import org.tasks.data.entity.Alarm.Companion.TYPE_DATE_TIME import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.jobs.AlarmEntry import org.tasks.makers.Maker.make diff --git a/app/src/test/java/org/tasks/makers/CaldavCalendarMaker.kt b/app/src/test/java/org/tasks/makers/CaldavCalendarMaker.kt index 851e9f3b9..5dba5d055 100644 --- a/app/src/test/java/org/tasks/makers/CaldavCalendarMaker.kt +++ b/app/src/test/java/org/tasks/makers/CaldavCalendarMaker.kt @@ -4,7 +4,7 @@ import com.natpryce.makeiteasy.Instantiator import com.natpryce.makeiteasy.Property import com.natpryce.makeiteasy.Property.newProperty import com.natpryce.makeiteasy.PropertyValue -import org.tasks.data.CaldavCalendar +import org.tasks.data.entity.CaldavCalendar import org.tasks.makers.Maker.make object CaldavCalendarMaker { diff --git a/app/src/test/java/org/tasks/makers/CaldavTaskMaker.kt b/app/src/test/java/org/tasks/makers/CaldavTaskMaker.kt index 08284c8eb..082b5d1f8 100644 --- a/app/src/test/java/org/tasks/makers/CaldavTaskMaker.kt +++ b/app/src/test/java/org/tasks/makers/CaldavTaskMaker.kt @@ -4,8 +4,8 @@ import com.natpryce.makeiteasy.Instantiator import com.natpryce.makeiteasy.Property import com.natpryce.makeiteasy.Property.newProperty import com.natpryce.makeiteasy.PropertyValue -import com.todoroo.astrid.helper.UUIDHelper -import org.tasks.data.CaldavTask +import org.tasks.data.UUIDHelper +import org.tasks.data.entity.CaldavTask import org.tasks.makers.Maker.make object CaldavTaskMaker { diff --git a/app/src/test/java/org/tasks/makers/TagDataMaker.kt b/app/src/test/java/org/tasks/makers/TagDataMaker.kt index ace76de9c..e5bf93c83 100644 --- a/app/src/test/java/org/tasks/makers/TagDataMaker.kt +++ b/app/src/test/java/org/tasks/makers/TagDataMaker.kt @@ -5,7 +5,7 @@ import com.natpryce.makeiteasy.Property import com.natpryce.makeiteasy.Property.newProperty import com.natpryce.makeiteasy.PropertyLookup import com.natpryce.makeiteasy.PropertyValue -import org.tasks.data.TagData +import org.tasks.data.entity.TagData import org.tasks.makers.Maker.make object TagDataMaker { diff --git a/app/src/test/java/org/tasks/makers/TagMaker.kt b/app/src/test/java/org/tasks/makers/TagMaker.kt index 7822912d6..cec1a20dc 100644 --- a/app/src/test/java/org/tasks/makers/TagMaker.kt +++ b/app/src/test/java/org/tasks/makers/TagMaker.kt @@ -5,9 +5,9 @@ import com.natpryce.makeiteasy.Property import com.natpryce.makeiteasy.Property.newProperty import com.natpryce.makeiteasy.PropertyLookup import com.natpryce.makeiteasy.PropertyValue -import com.todoroo.astrid.data.Task -import org.tasks.data.Tag -import org.tasks.data.TagData +import org.tasks.data.entity.Task +import org.tasks.data.entity.Tag +import org.tasks.data.entity.TagData import org.tasks.makers.Maker.make object TagMaker { diff --git a/app/src/test/java/org/tasks/makers/TaskContainerMaker.kt b/app/src/test/java/org/tasks/makers/TaskContainerMaker.kt index fc4837f83..d7d3c1189 100644 --- a/app/src/test/java/org/tasks/makers/TaskContainerMaker.kt +++ b/app/src/test/java/org/tasks/makers/TaskContainerMaker.kt @@ -6,7 +6,7 @@ import com.natpryce.makeiteasy.Property import com.natpryce.makeiteasy.Property.newProperty import com.natpryce.makeiteasy.PropertyLookup import com.natpryce.makeiteasy.PropertyValue -import com.todoroo.astrid.data.Task.Companion.NO_ID +import org.tasks.data.entity.Task.Companion.NO_ID import org.tasks.data.TaskContainer import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.makers.Maker.make diff --git a/app/src/test/java/org/tasks/makers/TaskMaker.kt b/app/src/test/java/org/tasks/makers/TaskMaker.kt index 487583efc..ecf42fd7a 100644 --- a/app/src/test/java/org/tasks/makers/TaskMaker.kt +++ b/app/src/test/java/org/tasks/makers/TaskMaker.kt @@ -5,9 +5,9 @@ import com.natpryce.makeiteasy.Property import com.natpryce.makeiteasy.Property.newProperty import com.natpryce.makeiteasy.PropertyLookup import com.natpryce.makeiteasy.PropertyValue -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.data.Task.Companion.HIDE_UNTIL_SPECIFIC_DAY -import com.todoroo.astrid.data.Task.Companion.NO_UUID +import org.tasks.data.entity.Task +import org.tasks.data.entity.Task.Companion.HIDE_UNTIL_SPECIFIC_DAY +import org.tasks.data.entity.Task.Companion.NO_UUID import org.tasks.data.createDueDate import org.tasks.data.createHideUntil import org.tasks.date.DateTimeUtils diff --git a/app/src/test/java/org/tasks/sync/microsoft/ConvertFromMicrosoftTests.kt b/app/src/test/java/org/tasks/sync/microsoft/ConvertFromMicrosoftTests.kt index 30e297ed0..9900f2538 100644 --- a/app/src/test/java/org/tasks/sync/microsoft/ConvertFromMicrosoftTests.kt +++ b/app/src/test/java/org/tasks/sync/microsoft/ConvertFromMicrosoftTests.kt @@ -1,7 +1,7 @@ package org.tasks.sync.microsoft import com.natpryce.makeiteasy.MakeItEasy -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task import org.junit.Assert import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/org/tasks/sync/microsoft/ConvertToMicrosoftTests.kt b/app/src/test/java/org/tasks/sync/microsoft/ConvertToMicrosoftTests.kt index 5f38a0e92..cabcf2d65 100644 --- a/app/src/test/java/org/tasks/sync/microsoft/ConvertToMicrosoftTests.kt +++ b/app/src/test/java/org/tasks/sync/microsoft/ConvertToMicrosoftTests.kt @@ -1,14 +1,14 @@ package org.tasks.sync.microsoft 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.Assert.assertTrue import org.junit.Test import org.tasks.Freeze.Companion.freezeAt import org.tasks.TestUtilities.withTZ -import org.tasks.data.CaldavTask +import org.tasks.data.entity.CaldavTask import org.tasks.makers.CaldavTaskMaker.REMOTE_ID import org.tasks.makers.CaldavTaskMaker.newCaldavTask import org.tasks.makers.TagDataMaker.NAME diff --git a/data/schemas/com.todoroo.astrid.dao.Database/39.json b/data/schemas/org.tasks.data.db.Database/39.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/39.json rename to data/schemas/org.tasks.data.db.Database/39.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/40.json b/data/schemas/org.tasks.data.db.Database/40.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/40.json rename to data/schemas/org.tasks.data.db.Database/40.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/41.json b/data/schemas/org.tasks.data.db.Database/41.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/41.json rename to data/schemas/org.tasks.data.db.Database/41.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/42.json b/data/schemas/org.tasks.data.db.Database/42.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/42.json rename to data/schemas/org.tasks.data.db.Database/42.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/43.json b/data/schemas/org.tasks.data.db.Database/43.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/43.json rename to data/schemas/org.tasks.data.db.Database/43.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/44.json b/data/schemas/org.tasks.data.db.Database/44.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/44.json rename to data/schemas/org.tasks.data.db.Database/44.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/45.json b/data/schemas/org.tasks.data.db.Database/45.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/45.json rename to data/schemas/org.tasks.data.db.Database/45.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/46.json b/data/schemas/org.tasks.data.db.Database/46.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/46.json rename to data/schemas/org.tasks.data.db.Database/46.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/47.json b/data/schemas/org.tasks.data.db.Database/47.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/47.json rename to data/schemas/org.tasks.data.db.Database/47.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/48.json b/data/schemas/org.tasks.data.db.Database/48.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/48.json rename to data/schemas/org.tasks.data.db.Database/48.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/49.json b/data/schemas/org.tasks.data.db.Database/49.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/49.json rename to data/schemas/org.tasks.data.db.Database/49.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/50.json b/data/schemas/org.tasks.data.db.Database/50.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/50.json rename to data/schemas/org.tasks.data.db.Database/50.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/51.json b/data/schemas/org.tasks.data.db.Database/51.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/51.json rename to data/schemas/org.tasks.data.db.Database/51.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/52.json b/data/schemas/org.tasks.data.db.Database/52.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/52.json rename to data/schemas/org.tasks.data.db.Database/52.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/53.json b/data/schemas/org.tasks.data.db.Database/53.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/53.json rename to data/schemas/org.tasks.data.db.Database/53.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/54.json b/data/schemas/org.tasks.data.db.Database/54.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/54.json rename to data/schemas/org.tasks.data.db.Database/54.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/55.json b/data/schemas/org.tasks.data.db.Database/55.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/55.json rename to data/schemas/org.tasks.data.db.Database/55.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/56.json b/data/schemas/org.tasks.data.db.Database/56.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/56.json rename to data/schemas/org.tasks.data.db.Database/56.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/57.json b/data/schemas/org.tasks.data.db.Database/57.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/57.json rename to data/schemas/org.tasks.data.db.Database/57.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/58.json b/data/schemas/org.tasks.data.db.Database/58.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/58.json rename to data/schemas/org.tasks.data.db.Database/58.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/59.json b/data/schemas/org.tasks.data.db.Database/59.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/59.json rename to data/schemas/org.tasks.data.db.Database/59.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/60.json b/data/schemas/org.tasks.data.db.Database/60.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/60.json rename to data/schemas/org.tasks.data.db.Database/60.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/61.json b/data/schemas/org.tasks.data.db.Database/61.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/61.json rename to data/schemas/org.tasks.data.db.Database/61.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/62.json b/data/schemas/org.tasks.data.db.Database/62.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/62.json rename to data/schemas/org.tasks.data.db.Database/62.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/63.json b/data/schemas/org.tasks.data.db.Database/63.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/63.json rename to data/schemas/org.tasks.data.db.Database/63.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/64.json b/data/schemas/org.tasks.data.db.Database/64.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/64.json rename to data/schemas/org.tasks.data.db.Database/64.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/65.json b/data/schemas/org.tasks.data.db.Database/65.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/65.json rename to data/schemas/org.tasks.data.db.Database/65.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/66.json b/data/schemas/org.tasks.data.db.Database/66.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/66.json rename to data/schemas/org.tasks.data.db.Database/66.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/67.json b/data/schemas/org.tasks.data.db.Database/67.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/67.json rename to data/schemas/org.tasks.data.db.Database/67.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/68.json b/data/schemas/org.tasks.data.db.Database/68.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/68.json rename to data/schemas/org.tasks.data.db.Database/68.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/69.json b/data/schemas/org.tasks.data.db.Database/69.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/69.json rename to data/schemas/org.tasks.data.db.Database/69.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/70.json b/data/schemas/org.tasks.data.db.Database/70.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/70.json rename to data/schemas/org.tasks.data.db.Database/70.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/71.json b/data/schemas/org.tasks.data.db.Database/71.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/71.json rename to data/schemas/org.tasks.data.db.Database/71.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/72.json b/data/schemas/org.tasks.data.db.Database/72.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/72.json rename to data/schemas/org.tasks.data.db.Database/72.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/73.json b/data/schemas/org.tasks.data.db.Database/73.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/73.json rename to data/schemas/org.tasks.data.db.Database/73.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/74.json b/data/schemas/org.tasks.data.db.Database/74.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/74.json rename to data/schemas/org.tasks.data.db.Database/74.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/75.json b/data/schemas/org.tasks.data.db.Database/75.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/75.json rename to data/schemas/org.tasks.data.db.Database/75.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/76.json b/data/schemas/org.tasks.data.db.Database/76.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/76.json rename to data/schemas/org.tasks.data.db.Database/76.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/77.json b/data/schemas/org.tasks.data.db.Database/77.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/77.json rename to data/schemas/org.tasks.data.db.Database/77.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/78.json b/data/schemas/org.tasks.data.db.Database/78.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/78.json rename to data/schemas/org.tasks.data.db.Database/78.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/79.json b/data/schemas/org.tasks.data.db.Database/79.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/79.json rename to data/schemas/org.tasks.data.db.Database/79.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/80.json b/data/schemas/org.tasks.data.db.Database/80.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/80.json rename to data/schemas/org.tasks.data.db.Database/80.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/81.json b/data/schemas/org.tasks.data.db.Database/81.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/81.json rename to data/schemas/org.tasks.data.db.Database/81.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/82.json b/data/schemas/org.tasks.data.db.Database/82.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/82.json rename to data/schemas/org.tasks.data.db.Database/82.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/83.json b/data/schemas/org.tasks.data.db.Database/83.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/83.json rename to data/schemas/org.tasks.data.db.Database/83.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/84.json b/data/schemas/org.tasks.data.db.Database/84.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/84.json rename to data/schemas/org.tasks.data.db.Database/84.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/85.json b/data/schemas/org.tasks.data.db.Database/85.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/85.json rename to data/schemas/org.tasks.data.db.Database/85.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/86.json b/data/schemas/org.tasks.data.db.Database/86.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/86.json rename to data/schemas/org.tasks.data.db.Database/86.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/87.json b/data/schemas/org.tasks.data.db.Database/87.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/87.json rename to data/schemas/org.tasks.data.db.Database/87.json diff --git a/data/schemas/com.todoroo.astrid.dao.Database/88.json b/data/schemas/org.tasks.data.db.Database/88.json similarity index 100% rename from data/schemas/com.todoroo.astrid.dao.Database/88.json rename to data/schemas/org.tasks.data.db.Database/88.json diff --git a/data/src/main/kotlin/org/tasks/data/CaldavFilters.kt b/data/src/main/kotlin/org/tasks/data/CaldavFilters.kt index 3d9633b0b..d54fdb79d 100644 --- a/data/src/main/kotlin/org/tasks/data/CaldavFilters.kt +++ b/data/src/main/kotlin/org/tasks/data/CaldavFilters.kt @@ -1,6 +1,7 @@ package org.tasks.data import androidx.room.Embedded +import org.tasks.data.entity.CaldavCalendar data class CaldavFilters( @JvmField @Embedded val caldavCalendar: CaldavCalendar, diff --git a/data/src/main/kotlin/org/tasks/data/CaldavTaskContainer.kt b/data/src/main/kotlin/org/tasks/data/CaldavTaskContainer.kt index 94c9fb518..3c86e3cb0 100644 --- a/data/src/main/kotlin/org/tasks/data/CaldavTaskContainer.kt +++ b/data/src/main/kotlin/org/tasks/data/CaldavTaskContainer.kt @@ -1,8 +1,9 @@ package org.tasks.data import androidx.room.Embedded -import com.todoroo.astrid.data.Task -import org.tasks.data.CaldavDao.Companion.toAppleEpoch +import org.tasks.data.entity.Task +import org.tasks.data.dao.CaldavDao.Companion.toAppleEpoch +import org.tasks.data.entity.CaldavTask class CaldavTaskContainer { @Embedded lateinit var task: Task diff --git a/data/src/main/kotlin/org/tasks/data/GoogleTaskFilters.kt b/data/src/main/kotlin/org/tasks/data/GoogleTaskFilters.kt index f37d59ed3..dfc8e535b 100644 --- a/data/src/main/kotlin/org/tasks/data/GoogleTaskFilters.kt +++ b/data/src/main/kotlin/org/tasks/data/GoogleTaskFilters.kt @@ -1,6 +1,7 @@ package org.tasks.data import androidx.room.Embedded +import org.tasks.data.entity.CaldavCalendar data class GoogleTaskFilters( @JvmField @Embedded val googleTaskList: CaldavCalendar, diff --git a/data/src/main/kotlin/org/tasks/data/Location.kt b/data/src/main/kotlin/org/tasks/data/Location.kt index c0db60074..4027cc257 100644 --- a/data/src/main/kotlin/org/tasks/data/Location.kt +++ b/data/src/main/kotlin/org/tasks/data/Location.kt @@ -4,6 +4,8 @@ import android.os.Parcel import android.os.Parcelable import androidx.room.Embedded import androidx.room.Ignore +import org.tasks.data.entity.Geofence +import org.tasks.data.entity.Place import java.io.Serializable data class Location( diff --git a/data/src/main/kotlin/org/tasks/data/LocationFilters.kt b/data/src/main/kotlin/org/tasks/data/LocationFilters.kt index 521915270..773ecfc36 100644 --- a/data/src/main/kotlin/org/tasks/data/LocationFilters.kt +++ b/data/src/main/kotlin/org/tasks/data/LocationFilters.kt @@ -1,6 +1,7 @@ package org.tasks.data import androidx.room.Embedded +import org.tasks.data.entity.Place data class LocationFilters( @JvmField @Embedded var place: Place, diff --git a/data/src/main/kotlin/org/tasks/data/MergedGeofence.kt b/data/src/main/kotlin/org/tasks/data/MergedGeofence.kt index c369ffc74..f9d2882cc 100644 --- a/data/src/main/kotlin/org/tasks/data/MergedGeofence.kt +++ b/data/src/main/kotlin/org/tasks/data/MergedGeofence.kt @@ -1,6 +1,7 @@ package org.tasks.data import androidx.room.Embedded +import org.tasks.data.entity.Place class MergedGeofence { @Embedded lateinit var place: Place diff --git a/data/src/main/kotlin/org/tasks/data/PlaceUsage.kt b/data/src/main/kotlin/org/tasks/data/PlaceUsage.kt index 3af706321..b2b0f7258 100644 --- a/data/src/main/kotlin/org/tasks/data/PlaceUsage.kt +++ b/data/src/main/kotlin/org/tasks/data/PlaceUsage.kt @@ -1,6 +1,7 @@ package org.tasks.data import androidx.room.Embedded +import org.tasks.data.entity.Place class PlaceUsage { @Embedded lateinit var place: Place diff --git a/data/src/main/kotlin/org/tasks/data/PrincipalWithAccess.kt b/data/src/main/kotlin/org/tasks/data/PrincipalWithAccess.kt index e85d57ccd..98579d4fb 100644 --- a/data/src/main/kotlin/org/tasks/data/PrincipalWithAccess.kt +++ b/data/src/main/kotlin/org/tasks/data/PrincipalWithAccess.kt @@ -2,6 +2,8 @@ package org.tasks.data import androidx.room.Embedded import androidx.room.Relation +import org.tasks.data.entity.Principal +import org.tasks.data.entity.PrincipalAccess data class PrincipalWithAccess( @Embedded val access: PrincipalAccess, diff --git a/data/src/main/kotlin/org/tasks/data/TagFilters.kt b/data/src/main/kotlin/org/tasks/data/TagFilters.kt index 65877fae4..da2b287d6 100644 --- a/data/src/main/kotlin/org/tasks/data/TagFilters.kt +++ b/data/src/main/kotlin/org/tasks/data/TagFilters.kt @@ -1,6 +1,7 @@ package org.tasks.data import androidx.room.Embedded +import org.tasks.data.entity.TagData data class TagFilters( @JvmField @Embedded var tagData: TagData, diff --git a/data/src/main/kotlin/org/tasks/data/TaskContainer.kt b/data/src/main/kotlin/org/tasks/data/TaskContainer.kt index 8af31ed96..f056086d0 100644 --- a/data/src/main/kotlin/org/tasks/data/TaskContainer.kt +++ b/data/src/main/kotlin/org/tasks/data/TaskContainer.kt @@ -2,9 +2,11 @@ package org.tasks.data import androidx.room.ColumnInfo import androidx.room.Embedded -import com.todoroo.astrid.data.Task -import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS -import org.tasks.data.CaldavAccount.Companion.TYPE_MICROSOFT +import org.tasks.data.entity.Task +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_MICROSOFT +import org.tasks.data.entity.CaldavTask data class TaskContainer( @Embedded val task: Task, diff --git a/data/src/main/kotlin/com/todoroo/astrid/helper/UUIDHelper.kt b/data/src/main/kotlin/org/tasks/data/UUIDHelper.kt similarity index 90% rename from data/src/main/kotlin/com/todoroo/astrid/helper/UUIDHelper.kt rename to data/src/main/kotlin/org/tasks/data/UUIDHelper.kt index b95eff7b5..85bf0ae85 100644 --- a/data/src/main/kotlin/com/todoroo/astrid/helper/UUIDHelper.kt +++ b/data/src/main/kotlin/org/tasks/data/UUIDHelper.kt @@ -1,4 +1,4 @@ -package com.todoroo.astrid.helper +package org.tasks.data import java.util.UUID diff --git a/data/src/main/kotlin/org/tasks/data/AlarmDao.kt b/data/src/main/kotlin/org/tasks/data/dao/AlarmDao.kt similarity index 89% rename from data/src/main/kotlin/org/tasks/data/AlarmDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/AlarmDao.kt index e7c23bf64..9e2ce6307 100644 --- a/data/src/main/kotlin/org/tasks/data/AlarmDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/AlarmDao.kt @@ -1,11 +1,12 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.Query -import com.todoroo.astrid.data.Task -import org.tasks.data.Alarm.Companion.TYPE_SNOOZE +import org.tasks.data.entity.Task +import org.tasks.data.entity.Alarm +import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE @Dao interface AlarmDao { diff --git a/data/src/main/kotlin/org/tasks/data/CaldavDao.kt b/data/src/main/kotlin/org/tasks/data/dao/CaldavDao.kt similarity index 95% rename from data/src/main/kotlin/org/tasks/data/CaldavDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/CaldavDao.kt index 9cd3f9c46..ea947ceb5 100644 --- a/data/src/main/kotlin/org/tasks/data/CaldavDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/CaldavDao.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.lifecycle.LiveData import androidx.room.Dao @@ -7,14 +7,21 @@ import androidx.room.Insert import androidx.room.Query import androidx.room.Transaction import androidx.room.Update -import com.todoroo.astrid.data.Task -import org.tasks.data.CaldavAccount.Companion.TYPE_ETESYNC -import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS -import org.tasks.data.CaldavAccount.Companion.TYPE_LOCAL -import org.tasks.data.CaldavAccount.Companion.TYPE_OPENTASKS -import org.tasks.data.CaldavAccount.Companion.TYPE_TASKS -import org.tasks.db.DbUtils.dbchunk -import org.tasks.db.SuspendDbUtils.chunkedMap +import org.tasks.data.entity.Task +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_ETESYNC +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_LOCAL +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_OPENTASKS +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_TASKS +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.CaldavFilters +import org.tasks.data.entity.CaldavTask +import org.tasks.data.CaldavTaskContainer +import org.tasks.data.NO_ORDER +import org.tasks.data.TaskContainer +import org.tasks.data.db.DbUtils.dbchunk +import org.tasks.data.db.SuspendDbUtils.chunkedMap import org.tasks.time.DateTimeUtils2.currentTimeMillis const val APPLE_EPOCH = 978307200000L // 1/1/2001 GMT diff --git a/data/src/main/kotlin/org/tasks/data/ContentProviderDao.kt b/data/src/main/kotlin/org/tasks/data/dao/ContentProviderDao.kt similarity index 93% rename from data/src/main/kotlin/org/tasks/data/ContentProviderDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/ContentProviderDao.kt index be0ade47a..645dc1bcd 100644 --- a/data/src/main/kotlin/org/tasks/data/ContentProviderDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/ContentProviderDao.kt @@ -1,11 +1,12 @@ -package org.tasks.data +package org.tasks.data.dao import android.database.Cursor import androidx.room.Dao import androidx.room.Query import androidx.room.RawQuery import androidx.sqlite.db.SupportSQLiteQuery -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task +import org.tasks.data.entity.TagData @Dao interface ContentProviderDao { diff --git a/data/src/main/kotlin/org/tasks/data/DeletionDao.kt b/data/src/main/kotlin/org/tasks/data/dao/DeletionDao.kt similarity index 91% rename from data/src/main/kotlin/org/tasks/data/DeletionDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/DeletionDao.kt index 7627885f9..d6cefeeb9 100644 --- a/data/src/main/kotlin/org/tasks/data/DeletionDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/DeletionDao.kt @@ -1,12 +1,14 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.Dao import androidx.room.Delete import androidx.room.Query import androidx.room.Transaction -import org.tasks.data.CaldavDao.Companion.LOCAL -import org.tasks.db.SuspendDbUtils.chunkedMap -import org.tasks.db.SuspendDbUtils.eachChunk +import org.tasks.data.dao.CaldavDao.Companion.LOCAL +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.db.SuspendDbUtils.chunkedMap +import org.tasks.data.db.SuspendDbUtils.eachChunk @Dao abstract class DeletionDao { diff --git a/data/src/main/kotlin/org/tasks/data/FilterDao.kt b/data/src/main/kotlin/org/tasks/data/dao/FilterDao.kt similarity index 90% rename from data/src/main/kotlin/org/tasks/data/FilterDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/FilterDao.kt index 653ad4405..e0c0d93fa 100644 --- a/data/src/main/kotlin/org/tasks/data/FilterDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/FilterDao.kt @@ -1,10 +1,12 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.Query import androidx.room.Update +import org.tasks.data.entity.Filter +import org.tasks.data.NO_ORDER @Dao interface FilterDao { diff --git a/data/src/main/kotlin/org/tasks/data/GoogleTaskDao.kt b/data/src/main/kotlin/org/tasks/data/dao/GoogleTaskDao.kt similarity index 97% rename from data/src/main/kotlin/org/tasks/data/GoogleTaskDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/GoogleTaskDao.kt index 575e94014..14da9879a 100644 --- a/data/src/main/kotlin/org/tasks/data/GoogleTaskDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/GoogleTaskDao.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.Dao import androidx.room.Delete @@ -6,8 +6,9 @@ import androidx.room.Insert import androidx.room.Query import androidx.room.Transaction import androidx.room.Update -import com.todoroo.astrid.data.Task -import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.entity.Task +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.entity.CaldavTask @Dao abstract class GoogleTaskDao { diff --git a/data/src/main/kotlin/org/tasks/data/GoogleTaskListDao.kt b/data/src/main/kotlin/org/tasks/data/dao/GoogleTaskListDao.kt similarity index 88% rename from data/src/main/kotlin/org/tasks/data/GoogleTaskListDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/GoogleTaskListDao.kt index e868ea690..077a32f0e 100644 --- a/data/src/main/kotlin/org/tasks/data/GoogleTaskListDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/GoogleTaskListDao.kt @@ -1,10 +1,13 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import org.tasks.data.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.GoogleTaskFilters +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS +import org.tasks.data.entity.CaldavCalendar import org.tasks.time.DateTimeUtils2.currentTimeMillis @Dao diff --git a/data/src/main/kotlin/org/tasks/data/LocationDao.kt b/data/src/main/kotlin/org/tasks/data/dao/LocationDao.kt similarity index 94% rename from data/src/main/kotlin/org/tasks/data/LocationDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/LocationDao.kt index b1e1b7021..7d71ae8ba 100644 --- a/data/src/main/kotlin/org/tasks/data/LocationDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/LocationDao.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.lifecycle.LiveData import androidx.room.Dao @@ -7,7 +7,14 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Update -import org.tasks.data.Alarm.Companion.TYPE_SNOOZE +import org.tasks.data.entity.Geofence +import org.tasks.data.Location +import org.tasks.data.LocationFilters +import org.tasks.data.MergedGeofence +import org.tasks.data.NO_ORDER +import org.tasks.data.entity.Place +import org.tasks.data.PlaceUsage +import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE import org.tasks.time.DateTimeUtils2.currentTimeMillis @Dao diff --git a/data/src/main/kotlin/org/tasks/data/NotificationDao.kt b/data/src/main/kotlin/org/tasks/data/dao/NotificationDao.kt similarity index 91% rename from data/src/main/kotlin/org/tasks/data/NotificationDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/NotificationDao.kt index a96025b22..9257722a6 100644 --- a/data/src/main/kotlin/org/tasks/data/NotificationDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/NotificationDao.kt @@ -1,9 +1,10 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query +import org.tasks.data.entity.Notification @Dao interface NotificationDao { diff --git a/data/src/main/kotlin/org/tasks/data/PrincipalDao.kt b/data/src/main/kotlin/org/tasks/data/dao/PrincipalDao.kt similarity index 89% rename from data/src/main/kotlin/org/tasks/data/PrincipalDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/PrincipalDao.kt index 7ac521b18..2a56b2e6f 100644 --- a/data/src/main/kotlin/org/tasks/data/PrincipalDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/PrincipalDao.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.lifecycle.LiveData import androidx.room.Dao @@ -7,6 +7,11 @@ import androidx.room.Insert import androidx.room.Query import androidx.room.Transaction import androidx.room.Update +import org.tasks.data.entity.Principal +import org.tasks.data.entity.PrincipalAccess +import org.tasks.data.PrincipalWithAccess +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar @Dao interface PrincipalDao { diff --git a/data/src/main/kotlin/org/tasks/data/TagDao.kt b/data/src/main/kotlin/org/tasks/data/dao/TagDao.kt similarity index 92% rename from data/src/main/kotlin/org/tasks/data/TagDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/TagDao.kt index ec076b892..d60972969 100644 --- a/data/src/main/kotlin/org/tasks/data/TagDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/TagDao.kt @@ -1,7 +1,9 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.* -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task +import org.tasks.data.entity.Tag +import org.tasks.data.entity.TagData @Dao abstract class TagDao { diff --git a/data/src/main/kotlin/org/tasks/data/TagDataDao.kt b/data/src/main/kotlin/org/tasks/data/dao/TagDataDao.kt similarity index 95% rename from data/src/main/kotlin/org/tasks/data/TagDataDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/TagDataDao.kt index 86d9df1ef..7cdf4f5f0 100644 --- a/data/src/main/kotlin/org/tasks/data/TagDataDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/TagDataDao.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.lifecycle.LiveData import androidx.room.Dao @@ -7,9 +7,13 @@ import androidx.room.Insert import androidx.room.Query import androidx.room.Transaction import androidx.room.Update -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.helper.UUIDHelper -import org.tasks.db.DbUtils +import org.tasks.data.entity.Task +import org.tasks.data.UUIDHelper +import org.tasks.data.NO_ORDER +import org.tasks.data.entity.Tag +import org.tasks.data.entity.TagData +import org.tasks.data.TagFilters +import org.tasks.data.db.DbUtils import org.tasks.time.DateTimeUtils2.currentTimeMillis @Dao diff --git a/data/src/main/kotlin/org/tasks/data/TaskAttachmentDao.kt b/data/src/main/kotlin/org/tasks/data/dao/TaskAttachmentDao.kt similarity index 91% rename from data/src/main/kotlin/org/tasks/data/TaskAttachmentDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/TaskAttachmentDao.kt index 253cc72ae..a198c85dc 100644 --- a/data/src/main/kotlin/org/tasks/data/TaskAttachmentDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/TaskAttachmentDao.kt @@ -1,6 +1,8 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.* +import org.tasks.data.entity.TaskAttachment +import org.tasks.data.entity.Attachment @Dao interface TaskAttachmentDao { diff --git a/data/src/main/kotlin/org/tasks/data/TaskDao.kt b/data/src/main/kotlin/org/tasks/data/dao/TaskDao.kt similarity index 84% rename from data/src/main/kotlin/org/tasks/data/TaskDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/TaskDao.kt index b83e0159f..b99e18f16 100644 --- a/data/src/main/kotlin/org/tasks/data/TaskDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/TaskDao.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.Dao import androidx.room.Insert @@ -7,16 +7,17 @@ import androidx.room.RawQuery import androidx.room.Update import androidx.room.withTransaction import androidx.sqlite.db.SimpleSQLiteQuery -import com.todoroo.andlib.sql.Criterion -import com.todoroo.andlib.sql.Functions -import com.todoroo.astrid.dao.Database -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.data.Task.Companion.NO_ID -import com.todoroo.astrid.helper.UUIDHelper -import org.tasks.data.Alarm.Companion.TYPE_SNOOZE -import org.tasks.db.SuspendDbUtils.chunkedMap -import org.tasks.db.SuspendDbUtils.eachChunk -import org.tasks.time.DateTimeUtils2.currentTimeMillis +import org.tasks.data.sql.Criterion +import org.tasks.data.sql.Functions +import org.tasks.data.db.Database +import org.tasks.data.entity.Task +import org.tasks.data.UUIDHelper +import org.tasks.data.BuildConfig +import org.tasks.data.TaskContainer +import org.tasks.data.entity.Alarm +import org.tasks.data.db.SuspendDbUtils.chunkedMap +import org.tasks.data.db.SuspendDbUtils.eachChunk +import org.tasks.time.DateTimeUtils2 import timber.log.Timber private const val MAX_TIME = 9999999999999 @@ -36,7 +37,7 @@ FROM ( WHERE completed = 0 AND deleted = 0 ) """) - abstract suspend fun nextRefresh(now: Long = currentTimeMillis()): Long + abstract suspend fun nextRefresh(now: Long = DateTimeUtils2.currentTimeMillis()): Long @Query("SELECT * FROM tasks WHERE _id = :id LIMIT 1") abstract suspend fun fetch(id: Long): Task? @@ -49,7 +50,7 @@ FROM ( @Query("SELECT COUNT(1) FROM tasks WHERE timerStart > 0 AND deleted = 0") abstract suspend fun activeTimers(): Int - @Query("SELECT COUNT(1) FROM tasks INNER JOIN alarms ON tasks._id = alarms.task WHERE deleted = 0 AND completed = 0 AND type = $TYPE_SNOOZE") + @Query("SELECT COUNT(1) FROM tasks INNER JOIN alarms ON tasks._id = alarms.task WHERE deleted = 0 AND completed = 0 AND type = ${Alarm.TYPE_SNOOZE}") abstract suspend fun snoozedReminders(): Int @Query("SELECT COUNT(1) FROM tasks INNER JOIN notification ON tasks._id = notification.task") @@ -69,7 +70,7 @@ FROM ( abstract suspend fun getRecurringTasks(remoteIds: List): List @Query("UPDATE tasks SET completed = :completionDate, modified = :updateTime WHERE remoteId IN (:remoteIds)") - abstract suspend fun setCompletionDate(remoteIds: List, completionDate: Long, updateTime: Long = currentTimeMillis()) + abstract suspend fun setCompletionDate(remoteIds: List, completionDate: Long, updateTime: Long = DateTimeUtils2.currentTimeMillis()) @Query("SELECT tasks.* FROM tasks " + "LEFT JOIN caldav_tasks ON tasks._id = caldav_tasks.cd_task " @@ -109,14 +110,18 @@ FROM ( open suspend fun fetchTasks(callback: suspend () -> List): List = database.withTransaction { - val start = if (BuildConfig.DEBUG) currentTimeMillis() else 0 + val start = if (BuildConfig.DEBUG) DateTimeUtils2.currentTimeMillis() else 0 val queries = callback() val last = queries.size - 1 for (i in 0 until last) { query(SimpleSQLiteQuery(queries[i])) } val result = fetchTasks(SimpleSQLiteQuery(queries[last])) - Timber.v("%sms: %s", currentTimeMillis() - start, queries.joinToString(";\n")) + Timber.v( + "%sms: %s", + DateTimeUtils2.currentTimeMillis() - start, + queries.joinToString(";\n") + ) result } @@ -129,11 +134,11 @@ FROM ( @RawQuery abstract suspend fun countRaw(query: SimpleSQLiteQuery): Int - suspend fun touch(ids: List, now: Long = currentTimeMillis()) = + suspend fun touch(ids: List, now: Long = DateTimeUtils2.currentTimeMillis()) = ids.eachChunk { internalTouch(it, now) } @Query("UPDATE tasks SET modified = :now WHERE _id in (:ids)") - internal abstract suspend fun internalTouch(ids: List, now: Long = currentTimeMillis()) + internal abstract suspend fun internalTouch(ids: List, now: Long = DateTimeUtils2.currentTimeMillis()) @Query("UPDATE tasks SET `order` = :order WHERE _id = :id") abstract suspend fun setOrder(id: Long, order: Long?) @@ -178,14 +183,14 @@ FROM recursive_tasks abstract suspend fun getParents(parent: Long): List @Query("UPDATE tasks SET collapsed = :collapsed, modified = :now WHERE _id IN (:ids)") - abstract suspend fun setCollapsed(ids: List, collapsed: Boolean, now: Long = currentTimeMillis()) + abstract suspend fun setCollapsed(ids: List, collapsed: Boolean, now: Long = DateTimeUtils2.currentTimeMillis()) @Insert abstract suspend fun insert(task: Task): Long suspend fun update(task: Task, original: Task? = null): Boolean { if (!task.insignificantChange(original)) { - task.modificationDate = currentTimeMillis() + task.modificationDate = DateTimeUtils2.currentTimeMillis() } return updateInternal(task) == 1 } @@ -197,9 +202,9 @@ FROM recursive_tasks abstract suspend fun updateInternal(tasks: List) suspend fun createNew(task: Task): Long { - task.id = NO_ID + task.id = Task.NO_ID if (task.creationDate == 0L) { - task.creationDate = currentTimeMillis() + task.creationDate = DateTimeUtils2.currentTimeMillis() } if (Task.isUuidEmpty(task.remoteId)) { task.remoteId = UUIDHelper.newUUID() @@ -226,8 +231,9 @@ WHERE cd_id IS NULL /** @return tasks that have not yet been completed or deleted */ @JvmStatic fun activeAndVisible(): Criterion = Criterion.and( - Task.COMPLETION_DATE.lte(0), - Task.DELETION_DATE.lte(0), - Task.HIDE_UNTIL.lte(Functions.now())) + Task.COMPLETION_DATE.lte(0), + Task.DELETION_DATE.lte(0), + Task.HIDE_UNTIL.lte(Functions.now()) + ) } } \ No newline at end of file diff --git a/data/src/main/kotlin/org/tasks/data/TaskListMetadataDao.kt b/data/src/main/kotlin/org/tasks/data/dao/TaskListMetadataDao.kt similarity index 90% rename from data/src/main/kotlin/org/tasks/data/TaskListMetadataDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/TaskListMetadataDao.kt index 5a4fb580e..f2baef443 100644 --- a/data/src/main/kotlin/org/tasks/data/TaskListMetadataDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/TaskListMetadataDao.kt @@ -1,9 +1,10 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.Query import androidx.room.Update +import org.tasks.data.entity.TaskListMetadata @Dao abstract class TaskListMetadataDao { diff --git a/data/src/main/kotlin/org/tasks/data/UpgraderDao.kt b/data/src/main/kotlin/org/tasks/data/dao/UpgraderDao.kt similarity index 93% rename from data/src/main/kotlin/org/tasks/data/UpgraderDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/UpgraderDao.kt index 7dbaac479..b9b69a1e2 100644 --- a/data/src/main/kotlin/org/tasks/data/UpgraderDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/UpgraderDao.kt @@ -1,7 +1,8 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.Dao import androidx.room.Query +import org.tasks.data.CaldavTaskContainer @Dao interface UpgraderDao { diff --git a/data/src/main/kotlin/org/tasks/data/UserActivityDao.kt b/data/src/main/kotlin/org/tasks/data/dao/UserActivityDao.kt similarity index 90% rename from data/src/main/kotlin/org/tasks/data/UserActivityDao.kt rename to data/src/main/kotlin/org/tasks/data/dao/UserActivityDao.kt index 3bd5de556..91db7585b 100644 --- a/data/src/main/kotlin/org/tasks/data/UserActivityDao.kt +++ b/data/src/main/kotlin/org/tasks/data/dao/UserActivityDao.kt @@ -1,13 +1,14 @@ -package org.tasks.data +package org.tasks.data.dao import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.Query import androidx.room.Update -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.entity.Task +import org.tasks.data.UUIDHelper import kotlinx.coroutines.flow.Flow +import org.tasks.data.entity.UserActivity import org.tasks.time.DateTimeUtils2.currentTimeMillis @Dao diff --git a/data/src/main/kotlin/org/tasks/data/AutoMigrations.kt b/data/src/main/kotlin/org/tasks/data/db/AutoMigrations.kt similarity index 92% rename from data/src/main/kotlin/org/tasks/data/AutoMigrations.kt rename to data/src/main/kotlin/org/tasks/data/db/AutoMigrations.kt index 48a5cc1d4..ae03d4041 100644 --- a/data/src/main/kotlin/org/tasks/data/AutoMigrations.kt +++ b/data/src/main/kotlin/org/tasks/data/db/AutoMigrations.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.db import androidx.room.DeleteColumn import androidx.room.migration.AutoMigrationSpec diff --git a/data/src/main/kotlin/com/todoroo/astrid/dao/Database.kt b/data/src/main/kotlin/org/tasks/data/db/Database.kt similarity index 56% rename from data/src/main/kotlin/com/todoroo/astrid/dao/Database.kt rename to data/src/main/kotlin/org/tasks/data/db/Database.kt index 18d958097..dc1dd03ed 100644 --- a/data/src/main/kotlin/com/todoroo/astrid/dao/Database.kt +++ b/data/src/main/kotlin/org/tasks/data/db/Database.kt @@ -1,43 +1,42 @@ -package com.todoroo.astrid.dao +package org.tasks.data.db import androidx.room.AutoMigration import androidx.room.Database import androidx.room.RoomDatabase -import com.todoroo.astrid.data.Task -import org.tasks.data.Alarm -import org.tasks.data.AlarmDao -import org.tasks.data.Attachment -import org.tasks.data.AutoMigrate83to84 -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavCalendar -import org.tasks.data.CaldavDao -import org.tasks.data.CaldavTask -import org.tasks.data.ContentProviderDao -import org.tasks.data.DeletionDao -import org.tasks.data.Filter -import org.tasks.data.FilterDao -import org.tasks.data.Geofence -import org.tasks.data.GoogleTaskDao -import org.tasks.data.GoogleTaskListDao -import org.tasks.data.LocationDao -import org.tasks.data.Notification -import org.tasks.data.NotificationDao -import org.tasks.data.Place -import org.tasks.data.Principal -import org.tasks.data.PrincipalAccess -import org.tasks.data.PrincipalDao -import org.tasks.data.Tag -import org.tasks.data.TagDao -import org.tasks.data.TagData -import org.tasks.data.TagDataDao -import org.tasks.data.TaskAttachment -import org.tasks.data.TaskAttachmentDao -import org.tasks.data.TaskDao -import org.tasks.data.TaskListMetadata -import org.tasks.data.TaskListMetadataDao -import org.tasks.data.UpgraderDao -import org.tasks.data.UserActivity -import org.tasks.data.UserActivityDao +import org.tasks.data.entity.Task +import org.tasks.data.entity.Alarm +import org.tasks.data.dao.AlarmDao +import org.tasks.data.entity.Attachment +import org.tasks.data.entity.CaldavAccount +import org.tasks.data.entity.CaldavCalendar +import org.tasks.data.dao.CaldavDao +import org.tasks.data.entity.CaldavTask +import org.tasks.data.dao.ContentProviderDao +import org.tasks.data.dao.DeletionDao +import org.tasks.data.entity.Filter +import org.tasks.data.dao.FilterDao +import org.tasks.data.entity.Geofence +import org.tasks.data.dao.GoogleTaskDao +import org.tasks.data.dao.GoogleTaskListDao +import org.tasks.data.dao.LocationDao +import org.tasks.data.entity.Notification +import org.tasks.data.dao.NotificationDao +import org.tasks.data.entity.Place +import org.tasks.data.entity.Principal +import org.tasks.data.entity.PrincipalAccess +import org.tasks.data.dao.PrincipalDao +import org.tasks.data.entity.Tag +import org.tasks.data.dao.TagDao +import org.tasks.data.entity.TagData +import org.tasks.data.dao.TagDataDao +import org.tasks.data.entity.TaskAttachment +import org.tasks.data.dao.TaskAttachmentDao +import org.tasks.data.dao.TaskDao +import org.tasks.data.entity.TaskListMetadata +import org.tasks.data.dao.TaskListMetadataDao +import org.tasks.data.dao.UpgraderDao +import org.tasks.data.entity.UserActivity +import org.tasks.data.dao.UserActivityDao @Database( entities = [ diff --git a/data/src/main/kotlin/org/tasks/db/DbUtils.kt b/data/src/main/kotlin/org/tasks/data/db/DbUtils.kt similarity index 82% rename from data/src/main/kotlin/org/tasks/db/DbUtils.kt rename to data/src/main/kotlin/org/tasks/data/db/DbUtils.kt index fdbe429da..d32ef4d08 100644 --- a/data/src/main/kotlin/org/tasks/db/DbUtils.kt +++ b/data/src/main/kotlin/org/tasks/data/db/DbUtils.kt @@ -1,4 +1,4 @@ -package org.tasks.db +package org.tasks.data.db object DbUtils { const val MAX_SQLITE_ARGS = 990 diff --git a/data/src/main/kotlin/com/todoroo/andlib/data/Property.kt b/data/src/main/kotlin/org/tasks/data/db/Property.kt similarity index 74% rename from data/src/main/kotlin/com/todoroo/andlib/data/Property.kt rename to data/src/main/kotlin/org/tasks/data/db/Property.kt index 163e73dcf..dced9615a 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/data/Property.kt +++ b/data/src/main/kotlin/org/tasks/data/db/Property.kt @@ -1,6 +1,6 @@ -package com.todoroo.andlib.data +package org.tasks.data.db -import com.todoroo.andlib.sql.Field +import org.tasks.data.sql.Field class Property internal constructor(val name: String, expression: String) : Field(expression) { diff --git a/data/src/main/kotlin/org/tasks/db/SuspendDbUtils.kt b/data/src/main/kotlin/org/tasks/data/db/SuspendDbUtils.kt similarity index 79% rename from data/src/main/kotlin/org/tasks/db/SuspendDbUtils.kt rename to data/src/main/kotlin/org/tasks/data/db/SuspendDbUtils.kt index 4b8256aec..64ab79cc3 100644 --- a/data/src/main/kotlin/org/tasks/db/SuspendDbUtils.kt +++ b/data/src/main/kotlin/org/tasks/data/db/SuspendDbUtils.kt @@ -1,7 +1,7 @@ -package org.tasks.db +package org.tasks.data.db -import org.tasks.db.DbUtils.MAX_SQLITE_ARGS -import org.tasks.db.DbUtils.dbchunk +import org.tasks.data.db.DbUtils.MAX_SQLITE_ARGS +import org.tasks.data.db.DbUtils.dbchunk object SuspendDbUtils { suspend fun Iterable.eachChunk(action: suspend (List) -> Unit) = diff --git a/data/src/main/kotlin/com/todoroo/andlib/data/Table.kt b/data/src/main/kotlin/org/tasks/data/db/Table.kt similarity index 86% rename from data/src/main/kotlin/com/todoroo/andlib/data/Table.kt rename to data/src/main/kotlin/org/tasks/data/db/Table.kt index 1a6f14bd6..9a3f399ec 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/data/Table.kt +++ b/data/src/main/kotlin/org/tasks/data/db/Table.kt @@ -1,6 +1,6 @@ -package com.todoroo.andlib.data +package org.tasks.data.db -import com.todoroo.andlib.sql.DBObject +import org.tasks.data.sql.DBObject class Table private constructor(private val name: String, alias: String?) : DBObject(name) { diff --git a/data/src/main/kotlin/org/tasks/data/Alarm.kt b/data/src/main/kotlin/org/tasks/data/entity/Alarm.kt similarity index 97% rename from data/src/main/kotlin/org/tasks/data/Alarm.kt rename to data/src/main/kotlin/org/tasks/data/entity/Alarm.kt index 4b3e2ecf6..0a772a1b6 100644 --- a/data/src/main/kotlin/org/tasks/data/Alarm.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/Alarm.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.entity import android.os.Parcel import android.os.Parcelable @@ -7,8 +7,7 @@ import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Ignore import androidx.room.PrimaryKey -import com.todoroo.andlib.data.Table -import com.todoroo.astrid.data.Task +import org.tasks.data.db.Table import org.tasks.time.printTimestamp import java.util.concurrent.TimeUnit diff --git a/data/src/main/kotlin/org/tasks/data/Attachment.kt b/data/src/main/kotlin/org/tasks/data/entity/Attachment.kt similarity index 82% rename from data/src/main/kotlin/org/tasks/data/Attachment.kt rename to data/src/main/kotlin/org/tasks/data/entity/Attachment.kt index f6e99350d..0c7bfe568 100644 --- a/data/src/main/kotlin/org/tasks/data/Attachment.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/Attachment.kt @@ -1,7 +1,10 @@ -package org.tasks.data +package org.tasks.data.entity -import androidx.room.* -import com.todoroo.astrid.data.Task +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.Index +import androidx.room.PrimaryKey @Entity( tableName = "attachment", diff --git a/data/src/main/kotlin/org/tasks/data/CaldavAccount.kt b/data/src/main/kotlin/org/tasks/data/entity/CaldavAccount.kt similarity index 97% rename from data/src/main/kotlin/org/tasks/data/CaldavAccount.kt rename to data/src/main/kotlin/org/tasks/data/entity/CaldavAccount.kt index 08c8ef5b4..2262b1d2c 100644 --- a/data/src/main/kotlin/org/tasks/data/CaldavAccount.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/CaldavAccount.kt @@ -1,11 +1,10 @@ -package org.tasks.data +package org.tasks.data.entity import android.os.Parcelable import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import com.todoroo.andlib.data.Table -import com.todoroo.astrid.data.Task +import org.tasks.data.db.Table import kotlinx.parcelize.Parcelize import java.net.HttpURLConnection diff --git a/data/src/main/kotlin/org/tasks/data/CaldavCalendar.kt b/data/src/main/kotlin/org/tasks/data/entity/CaldavCalendar.kt similarity index 93% rename from data/src/main/kotlin/org/tasks/data/CaldavCalendar.kt rename to data/src/main/kotlin/org/tasks/data/entity/CaldavCalendar.kt index cfa280c6d..1bb3f68f3 100644 --- a/data/src/main/kotlin/org/tasks/data/CaldavCalendar.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/CaldavCalendar.kt @@ -1,12 +1,13 @@ -package org.tasks.data +package org.tasks.data.entity import android.os.Parcelable import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import com.todoroo.andlib.data.Table -import com.todoroo.astrid.data.Task +import org.tasks.data.db.Table import kotlinx.parcelize.Parcelize +import org.tasks.data.LIST +import org.tasks.data.NO_ORDER @Parcelize @Entity(tableName = "caldav_lists") diff --git a/data/src/main/kotlin/org/tasks/data/CaldavTask.kt b/data/src/main/kotlin/org/tasks/data/entity/CaldavTask.kt similarity index 92% rename from data/src/main/kotlin/org/tasks/data/CaldavTask.kt rename to data/src/main/kotlin/org/tasks/data/entity/CaldavTask.kt index c3b270ce2..0a31b744c 100644 --- a/data/src/main/kotlin/org/tasks/data/CaldavTask.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/CaldavTask.kt @@ -1,12 +1,11 @@ -package org.tasks.data +package org.tasks.data.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.PrimaryKey -import com.todoroo.andlib.data.Table -import com.todoroo.astrid.data.Task -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.db.Table +import org.tasks.data.UUIDHelper @Entity( tableName = "caldav_tasks", diff --git a/data/src/main/kotlin/org/tasks/data/Filter.kt b/data/src/main/kotlin/org/tasks/data/entity/Filter.kt similarity index 92% rename from data/src/main/kotlin/org/tasks/data/Filter.kt rename to data/src/main/kotlin/org/tasks/data/entity/Filter.kt index 9e4d6fa42..1c8a1b1a5 100644 --- a/data/src/main/kotlin/org/tasks/data/Filter.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/Filter.kt @@ -1,10 +1,11 @@ -package org.tasks.data +package org.tasks.data.entity import android.os.Parcelable import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey import kotlinx.parcelize.Parcelize +import org.tasks.data.NO_ORDER @Parcelize @Entity(tableName = "filters") diff --git a/data/src/main/kotlin/org/tasks/data/Geofence.kt b/data/src/main/kotlin/org/tasks/data/entity/Geofence.kt similarity index 94% rename from data/src/main/kotlin/org/tasks/data/Geofence.kt rename to data/src/main/kotlin/org/tasks/data/entity/Geofence.kt index 133a3a974..668db75f3 100644 --- a/data/src/main/kotlin/org/tasks/data/Geofence.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/Geofence.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.entity import android.os.Parcelable import androidx.room.ColumnInfo @@ -6,8 +6,7 @@ import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Ignore import androidx.room.PrimaryKey -import com.todoroo.andlib.data.Table -import com.todoroo.astrid.data.Task +import org.tasks.data.db.Table import kotlinx.parcelize.Parcelize import java.io.Serializable diff --git a/data/src/main/kotlin/org/tasks/data/Notification.kt b/data/src/main/kotlin/org/tasks/data/entity/Notification.kt similarity index 92% rename from data/src/main/kotlin/org/tasks/data/Notification.kt rename to data/src/main/kotlin/org/tasks/data/entity/Notification.kt index d208ce309..7876cc4c2 100644 --- a/data/src/main/kotlin/org/tasks/data/Notification.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/Notification.kt @@ -1,12 +1,11 @@ -package org.tasks.data +package org.tasks.data.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index import androidx.room.PrimaryKey -import com.todoroo.andlib.data.Table -import com.todoroo.astrid.data.Task +import org.tasks.data.db.Table @Entity( tableName = Notification.TABLE_NAME, diff --git a/data/src/main/kotlin/org/tasks/data/Place.kt b/data/src/main/kotlin/org/tasks/data/entity/Place.kt similarity index 95% rename from data/src/main/kotlin/org/tasks/data/Place.kt rename to data/src/main/kotlin/org/tasks/data/entity/Place.kt index d6716974b..3899653cc 100644 --- a/data/src/main/kotlin/org/tasks/data/Place.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/Place.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.entity import android.location.Location import android.os.Parcelable @@ -6,9 +6,10 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Index import androidx.room.PrimaryKey -import com.todoroo.andlib.data.Table -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.db.Table +import org.tasks.data.UUIDHelper import kotlinx.parcelize.Parcelize +import org.tasks.data.NO_ORDER import java.io.Serializable import java.util.regex.Pattern import kotlin.math.abs diff --git a/data/src/main/kotlin/org/tasks/data/Principal.kt b/data/src/main/kotlin/org/tasks/data/entity/Principal.kt similarity index 97% rename from data/src/main/kotlin/org/tasks/data/Principal.kt rename to data/src/main/kotlin/org/tasks/data/entity/Principal.kt index bf303e799..0c88b7bde 100644 --- a/data/src/main/kotlin/org/tasks/data/Principal.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/Principal.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/data/src/main/kotlin/org/tasks/data/PrincipalAccess.kt b/data/src/main/kotlin/org/tasks/data/entity/PrincipalAccess.kt similarity index 84% rename from data/src/main/kotlin/org/tasks/data/PrincipalAccess.kt rename to data/src/main/kotlin/org/tasks/data/entity/PrincipalAccess.kt index e35073ec2..ab1ca6cc2 100644 --- a/data/src/main/kotlin/org/tasks/data/PrincipalAccess.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/PrincipalAccess.kt @@ -1,11 +1,11 @@ -package org.tasks.data +package org.tasks.data.entity import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Index import androidx.room.PrimaryKey -import org.tasks.data.CaldavCalendar.Companion.ACCESS_UNKNOWN -import org.tasks.data.CaldavCalendar.Companion.INVITE_UNKNOWN +import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_UNKNOWN +import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_UNKNOWN @Entity( tableName = "principal_access", diff --git a/data/src/main/kotlin/org/tasks/data/Tag.kt b/data/src/main/kotlin/org/tasks/data/entity/Tag.kt similarity index 94% rename from data/src/main/kotlin/org/tasks/data/Tag.kt rename to data/src/main/kotlin/org/tasks/data/entity/Tag.kt index d99ecdccd..7d6b95715 100644 --- a/data/src/main/kotlin/org/tasks/data/Tag.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/Tag.kt @@ -1,12 +1,11 @@ -package org.tasks.data +package org.tasks.data.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Ignore import androidx.room.PrimaryKey -import com.todoroo.andlib.data.Table -import com.todoroo.astrid.data.Task +import org.tasks.data.db.Table @Entity( tableName = "tags", diff --git a/data/src/main/kotlin/org/tasks/data/TagData.kt b/data/src/main/kotlin/org/tasks/data/entity/TagData.kt similarity index 97% rename from data/src/main/kotlin/org/tasks/data/TagData.kt rename to data/src/main/kotlin/org/tasks/data/entity/TagData.kt index 2fa5326b9..c98ae7175 100644 --- a/data/src/main/kotlin/org/tasks/data/TagData.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/TagData.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.entity import android.annotation.SuppressLint import android.os.Parcel @@ -7,7 +7,8 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Ignore import androidx.room.PrimaryKey -import com.todoroo.astrid.data.Task +import org.tasks.data.LABEL +import org.tasks.data.NO_ORDER @Entity(tableName = "tagdata") class TagData : Parcelable { diff --git a/data/src/main/kotlin/com/todoroo/astrid/data/Task.kt b/data/src/main/kotlin/org/tasks/data/entity/Task.kt similarity index 98% rename from data/src/main/kotlin/com/todoroo/astrid/data/Task.kt rename to data/src/main/kotlin/org/tasks/data/entity/Task.kt index 4807df870..3f7f0a26c 100644 --- a/data/src/main/kotlin/com/todoroo/astrid/data/Task.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/Task.kt @@ -1,4 +1,4 @@ -package com.todoroo.astrid.data +package org.tasks.data.entity import android.os.Parcelable import androidx.annotation.IntDef @@ -8,11 +8,10 @@ import androidx.room.Ignore import androidx.room.Index import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName -import com.todoroo.andlib.data.Table -import com.todoroo.andlib.sql.Field +import org.tasks.data.db.Table +import org.tasks.data.sql.Field import kotlinx.parcelize.Parcelize import kotlinx.parcelize.RawValue -import org.tasks.data.Tag import timber.log.Timber const val SUPPRESS_SYNC = "suppress_sync" diff --git a/data/src/main/kotlin/org/tasks/data/TaskAttachment.kt b/data/src/main/kotlin/org/tasks/data/entity/TaskAttachment.kt similarity index 90% rename from data/src/main/kotlin/org/tasks/data/TaskAttachment.kt rename to data/src/main/kotlin/org/tasks/data/entity/TaskAttachment.kt index 074c4b165..59f56e144 100644 --- a/data/src/main/kotlin/org/tasks/data/TaskAttachment.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/TaskAttachment.kt @@ -1,10 +1,10 @@ -package org.tasks.data +package org.tasks.data.entity import android.os.Parcelable import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import com.todoroo.astrid.helper.UUIDHelper +import org.tasks.data.UUIDHelper import kotlinx.parcelize.Parcelize @Parcelize diff --git a/data/src/main/kotlin/org/tasks/data/TaskListMetadata.kt b/data/src/main/kotlin/org/tasks/data/entity/TaskListMetadata.kt similarity index 91% rename from data/src/main/kotlin/org/tasks/data/TaskListMetadata.kt rename to data/src/main/kotlin/org/tasks/data/entity/TaskListMetadata.kt index 9b5e3042e..c7f454613 100644 --- a/data/src/main/kotlin/org/tasks/data/TaskListMetadata.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/TaskListMetadata.kt @@ -1,9 +1,9 @@ -package org.tasks.data +package org.tasks.data.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import com.todoroo.astrid.data.Task +import org.tasks.data.entity.Task /** * Data Model which represents a user. diff --git a/data/src/main/kotlin/org/tasks/data/UserActivity.kt b/data/src/main/kotlin/org/tasks/data/entity/UserActivity.kt similarity index 96% rename from data/src/main/kotlin/org/tasks/data/UserActivity.kt rename to data/src/main/kotlin/org/tasks/data/entity/UserActivity.kt index 60b7bb099..f21ff4924 100644 --- a/data/src/main/kotlin/org/tasks/data/UserActivity.kt +++ b/data/src/main/kotlin/org/tasks/data/entity/UserActivity.kt @@ -1,4 +1,4 @@ -package org.tasks.data +package org.tasks.data.entity import android.net.Uri import android.os.Parcel @@ -7,8 +7,7 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Ignore import androidx.room.PrimaryKey -import com.todoroo.andlib.data.Table -import com.todoroo.astrid.data.Task +import org.tasks.data.db.Table import org.json.JSONException import org.json.JSONObject import timber.log.Timber diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/Criterion.kt b/data/src/main/kotlin/org/tasks/data/sql/Criterion.kt similarity index 97% rename from data/src/main/kotlin/com/todoroo/andlib/sql/Criterion.kt rename to data/src/main/kotlin/org/tasks/data/sql/Criterion.kt index a574c0741..faba78fbc 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/Criterion.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/Criterion.kt @@ -1,4 +1,4 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql abstract class Criterion(val operator: Operator) { diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/DBObject.kt b/data/src/main/kotlin/org/tasks/data/sql/DBObject.kt similarity index 94% rename from data/src/main/kotlin/com/todoroo/andlib/sql/DBObject.kt rename to data/src/main/kotlin/org/tasks/data/sql/DBObject.kt index 997b0cf15..9b5339c8d 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/DBObject.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/DBObject.kt @@ -1,4 +1,4 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql import java.util.* diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/Field.kt b/data/src/main/kotlin/org/tasks/data/sql/Field.kt similarity index 98% rename from data/src/main/kotlin/com/todoroo/andlib/sql/Field.kt rename to data/src/main/kotlin/org/tasks/data/sql/Field.kt index 82406a2d0..c7264cf7f 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/Field.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/Field.kt @@ -1,4 +1,4 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql open class Field(expression: String) : DBObject(expression) { fun eq(value: Any?): Criterion = if (value == null) { diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/Functions.kt b/data/src/main/kotlin/org/tasks/data/sql/Functions.kt similarity index 83% rename from data/src/main/kotlin/com/todoroo/andlib/sql/Functions.kt rename to data/src/main/kotlin/org/tasks/data/sql/Functions.kt index 8164845f8..c183443e9 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/Functions.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/Functions.kt @@ -1,4 +1,4 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql object Functions { @JvmStatic fun upper(title: Field): Field = Field("UPPER($title)") diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/Join.kt b/data/src/main/kotlin/org/tasks/data/sql/Join.kt similarity index 90% rename from data/src/main/kotlin/com/todoroo/andlib/sql/Join.kt rename to data/src/main/kotlin/org/tasks/data/sql/Join.kt index 8ea0967c7..976b06f49 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/Join.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/Join.kt @@ -1,6 +1,6 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql -import com.todoroo.andlib.data.Table +import org.tasks.data.db.Table class Join private constructor(private val joinTable: Table, private val joinType: JoinType, criterions: List) { private val criterions = criterions.toList() diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/JoinType.kt b/data/src/main/kotlin/org/tasks/data/sql/JoinType.kt similarity index 54% rename from data/src/main/kotlin/com/todoroo/andlib/sql/JoinType.kt rename to data/src/main/kotlin/org/tasks/data/sql/JoinType.kt index 59c10bd06..4dfe3347f 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/JoinType.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/JoinType.kt @@ -1,4 +1,4 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql enum class JoinType { INNER, LEFT diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/Operator.kt b/data/src/main/kotlin/org/tasks/data/sql/Operator.kt similarity index 94% rename from data/src/main/kotlin/com/todoroo/andlib/sql/Operator.kt rename to data/src/main/kotlin/org/tasks/data/sql/Operator.kt index 4aa5a8e8f..514169486 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/Operator.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/Operator.kt @@ -1,4 +1,4 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql class Operator private constructor(private val operator: String) { override fun toString() = operator diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/Order.kt b/data/src/main/kotlin/org/tasks/data/sql/Order.kt similarity index 85% rename from data/src/main/kotlin/com/todoroo/andlib/sql/Order.kt rename to data/src/main/kotlin/org/tasks/data/sql/Order.kt index f1ca11c37..4d7d9bc36 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/Order.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/Order.kt @@ -1,7 +1,7 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql -import com.todoroo.andlib.sql.OrderType.ASC -import com.todoroo.andlib.sql.OrderType.DESC +import org.tasks.data.sql.OrderType.ASC +import org.tasks.data.sql.OrderType.DESC class Order private constructor(private val expression: Any, val orderType: OrderType = ASC) { private val secondaryExpressions = ArrayList() diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/OrderType.kt b/data/src/main/kotlin/org/tasks/data/sql/OrderType.kt similarity index 54% rename from data/src/main/kotlin/com/todoroo/andlib/sql/OrderType.kt rename to data/src/main/kotlin/org/tasks/data/sql/OrderType.kt index 8b1a626e1..ed9ed1968 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/OrderType.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/OrderType.kt @@ -1,4 +1,4 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql enum class OrderType { DESC, ASC diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/Query.kt b/data/src/main/kotlin/org/tasks/data/sql/Query.kt similarity index 82% rename from data/src/main/kotlin/com/todoroo/andlib/sql/Query.kt rename to data/src/main/kotlin/org/tasks/data/sql/Query.kt index b5bfdd6e1..1e14e3eb5 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/Query.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/Query.kt @@ -1,10 +1,10 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql -import com.todoroo.andlib.data.Table -import com.todoroo.andlib.sql.StringBuilderExtensions.from -import com.todoroo.andlib.sql.StringBuilderExtensions.join -import com.todoroo.andlib.sql.StringBuilderExtensions.select -import com.todoroo.andlib.sql.StringBuilderExtensions.where +import org.tasks.data.db.Table +import org.tasks.data.sql.StringBuilderExtensions.from +import org.tasks.data.sql.StringBuilderExtensions.join +import org.tasks.data.sql.StringBuilderExtensions.select +import org.tasks.data.sql.StringBuilderExtensions.where import java.util.* class Query private constructor(vararg fields: Field?) { diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/QueryTemplate.kt b/data/src/main/kotlin/org/tasks/data/sql/QueryTemplate.kt similarity index 76% rename from data/src/main/kotlin/com/todoroo/andlib/sql/QueryTemplate.kt rename to data/src/main/kotlin/org/tasks/data/sql/QueryTemplate.kt index f634b52d8..b7d4d026e 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/QueryTemplate.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/QueryTemplate.kt @@ -1,8 +1,8 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql -import com.todoroo.andlib.sql.StringBuilderExtensions.join -import com.todoroo.andlib.sql.StringBuilderExtensions.orderBy -import com.todoroo.andlib.sql.StringBuilderExtensions.where +import org.tasks.data.sql.StringBuilderExtensions.join +import org.tasks.data.sql.StringBuilderExtensions.orderBy +import org.tasks.data.sql.StringBuilderExtensions.where import java.util.* class QueryTemplate { diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/StringBuilderExtensions.kt b/data/src/main/kotlin/org/tasks/data/sql/StringBuilderExtensions.kt similarity index 93% rename from data/src/main/kotlin/com/todoroo/andlib/sql/StringBuilderExtensions.kt rename to data/src/main/kotlin/org/tasks/data/sql/StringBuilderExtensions.kt index d0c252b15..c1c370014 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/StringBuilderExtensions.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/StringBuilderExtensions.kt @@ -1,6 +1,6 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql -import com.todoroo.andlib.data.Table +import org.tasks.data.db.Table object StringBuilderExtensions { fun StringBuilder.join(joins: List): StringBuilder { diff --git a/data/src/main/kotlin/com/todoroo/andlib/sql/UnaryCriterion.kt b/data/src/main/kotlin/org/tasks/data/sql/UnaryCriterion.kt similarity index 98% rename from data/src/main/kotlin/com/todoroo/andlib/sql/UnaryCriterion.kt rename to data/src/main/kotlin/org/tasks/data/sql/UnaryCriterion.kt index b65a2abb0..7d0294af5 100644 --- a/data/src/main/kotlin/com/todoroo/andlib/sql/UnaryCriterion.kt +++ b/data/src/main/kotlin/org/tasks/data/sql/UnaryCriterion.kt @@ -1,4 +1,4 @@ -package com.todoroo.andlib.sql +package org.tasks.data.sql open class UnaryCriterion private constructor(private val expression: Field, operator: Operator, private val value: Any?) : Criterion(operator) { override fun populate() = "$expression${populateOperator()}${afterPopulateOperator()}"