Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4a7c357c5f | ||
|
|
3452fd631b | ||
|
|
b8264e336f | ||
|
|
2c450d300f | ||
|
|
df1fb4e46b | ||
|
|
63c7aa64e2 | ||
|
|
c26ff5909b | ||
|
|
c1219a434d | ||
|
|
5dc1d49295 | ||
|
|
558e63bc1c |
No files matched your search
@@ -7,96 +7,6 @@ All notable changes to this project are documented here. The format follows
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
## [1.3.2] - 2026-11-13
|
|
||||||
|
|
||||||
### Added
|
|
||||||
- A "Description in reminders" setting under Notifications sets how much of a
|
|
||||||
task's description a reminder shows: none, a short preview of up to three
|
|
||||||
lines (the new default), or all of it as before (#156).
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- A list with its own default reminders is easier to spot. The task editor
|
|
||||||
notes when the reminders it adds come from the list's defaults rather than
|
|
||||||
the general one, and Settings → Notifications counts the lists that use
|
|
||||||
their own and marks them in Per-list reminders (#121).
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- With 3-button navigation, the navigation bar no longer covers the last home
|
|
||||||
search results, and in landscape it no longer covers the home screen, the
|
|
||||||
task list or the home top bar's buttons. The task details and editor no
|
|
||||||
longer leave an empty gap between the open keyboard and the text, nor does
|
|
||||||
the task list while typing in the quick-add bar. On tablets and in landscape
|
|
||||||
the screens now keep to a centred, readable width as intended (#152).
|
|
||||||
- Tapping into a long task description in the editor scrolls the line you
|
|
||||||
tapped above the keyboard as soon as it opens, instead of leaving it hidden
|
|
||||||
until you start typing (#158).
|
|
||||||
- Removing a task's last date also removes its reminders, so the task can be
|
|
||||||
saved again. Reminders you picked yourself come back when you set a new date
|
|
||||||
(#159).
|
|
||||||
- With CalDAV sync, ticking off a repeating task should now also move it on in
|
|
||||||
Apple Reminders, instead of leaving the old occurrence open next to the
|
|
||||||
completed copy. Edits Agendula uploads raise the task's `SEQUENCE`, which
|
|
||||||
Apple's apps use to tell a newer version; tasks with an organiser keep
|
|
||||||
theirs (#137).
|
|
||||||
- Sub-tasks of a repeating task start over when ticking off its current
|
|
||||||
occurrence moves it on to its next date, as in tasks.org: completed and
|
|
||||||
half-done ones open again, and dated ones move along with the task. Before,
|
|
||||||
the next occurrence showed them already ticked. Unticking gives them back
|
|
||||||
their state and dates, and repeating sub-tasks keep their own schedule
|
|
||||||
(#160).
|
|
||||||
|
|
||||||
## [1.3.1] - 2026-11-09
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- Ticking off the current occurrence of a repeating task moves the series on
|
|
||||||
to its next date and keeps a completed copy, as tasks.org and Apple
|
|
||||||
Reminders do. Other apps and the web views of servers such as Infomaniak now
|
|
||||||
see it as done instead of still open. Unticking it moves the series back,
|
|
||||||
as long as the series hasn't moved on or changed its start since (#137).
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- With tasks.org as the storage provider, recurring tasks are recognised as
|
|
||||||
recurring. Before, editing one removed its recurrence and ticking it off
|
|
||||||
closed the whole series. With tasks.org and OpenTasks alike, the editor now
|
|
||||||
shows the task's repeat rule instead of none, and an occurrence changed on
|
|
||||||
its own stays part of its series (#135).
|
|
||||||
- With tasks.org or OpenTasks as the storage provider, the order you give your
|
|
||||||
lists is kept instead of snapping back (#136).
|
|
||||||
|
|
||||||
## [1.3.0] - 2026-11-02
|
|
||||||
|
|
||||||
### Added
|
|
||||||
- Self-hosted servers with a self-signed certificate can be added: Agendula
|
|
||||||
shows the certificate's fingerprint and asks whether to trust it. A server
|
|
||||||
reached over plain http can be added too, after a warning. If a trusted
|
|
||||||
certificate is later renewed, "Sign in again" on the account asks about the
|
|
||||||
new one (#68).
|
|
||||||
- An account can be given its own name (#105).
|
|
||||||
- Pull down on the task list to sync (#73).
|
|
||||||
- Task list sections can be collapsed (#91).
|
|
||||||
- A pure black theme for AMOLED screens (#99).
|
|
||||||
- Agendula can show up as "Tasks" in your launcher, picked from launcher
|
|
||||||
previews as in Calendula (#104).
|
|
||||||
- Reminder notifications show the task's description (#94).
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- Adding or opening a task from a widget returns you to the home screen
|
|
||||||
afterwards (#93).
|
|
||||||
- A swipe that starts at the screen edge no longer swipes the task (#90).
|
|
||||||
- Today also lists tasks that start today, and keeps the ones completed today
|
|
||||||
in a Completed section (#123).
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- A task created from Today, or from a Today widget, is due today, so it shows
|
|
||||||
up there (#122).
|
|
||||||
- Completing a task from the list, a widget or another device now cancels its
|
|
||||||
upcoming reminder and clears one already showing (#127, #129).
|
|
||||||
- The splash screen follows the app's theme, including Black and dynamic
|
|
||||||
colour, instead of flashing white in dark mode (#119).
|
|
||||||
- A task saved without its default start or due reminder because it had
|
|
||||||
already rung (a start of "now", say) gets it once that date is moved later,
|
|
||||||
if the task has no reminder from that date (#121).
|
|
||||||
|
|
||||||
## [1.2.0] - 2026-10-26
|
## [1.2.0] - 2026-10-26
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -33,8 +33,8 @@ android {
|
|||||||
// (1.0.x: 1.0.0 -> 10000; from 1.1.0: 1.1.0-beta.1 -> 1010001,
|
// (1.0.x: 1.0.0 -> 10000; from 1.1.0: 1.1.0-beta.1 -> 1010001,
|
||||||
// 1.1.0 -> 1010099), and CI fails if the committed one doesn't match.
|
// 1.1.0 -> 1010099), and CI fails if the committed one doesn't match.
|
||||||
// See docs/RELEASING.md.
|
// See docs/RELEASING.md.
|
||||||
versionCode = 1030299
|
versionCode = 1020099
|
||||||
versionName = "1.3.2"
|
versionName = "1.2.0"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|
||||||
|
|||||||
@@ -1,768 +0,0 @@
|
|||||||
{
|
|
||||||
"formatVersion": 1,
|
|
||||||
"database": {
|
|
||||||
"version": 5,
|
|
||||||
"identityHash": "fcb14ff68d892c72fa7459204276abb6",
|
|
||||||
"entities": [
|
|
||||||
{
|
|
||||||
"tableName": "accounts",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `display_name` TEXT NOT NULL, `principal_url` TEXT, `home_set_url` TEXT, `username` TEXT, `last_sync_at` INTEGER, `last_sync_error` TEXT, `label` TEXT)",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "displayName",
|
|
||||||
"columnName": "display_name",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "principalUrl",
|
|
||||||
"columnName": "principal_url",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "homeSetUrl",
|
|
||||||
"columnName": "home_set_url",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "username",
|
|
||||||
"columnName": "username",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "lastSyncAt",
|
|
||||||
"columnName": "last_sync_at",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "lastSyncError",
|
|
||||||
"columnName": "last_sync_error",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "label",
|
|
||||||
"columnName": "label",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": true,
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "task_lists",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `color` INTEGER NOT NULL, `account_id` INTEGER, `is_visible` INTEGER NOT NULL DEFAULT 1, `is_synced` INTEGER NOT NULL DEFAULT 1, `owner` TEXT, `is_read_only` INTEGER NOT NULL DEFAULT 0, `sort_order` INTEGER NOT NULL DEFAULT 0, `href` TEXT, `ctag` TEXT, `sync_token` TEXT, `is_dirty` INTEGER NOT NULL DEFAULT 0, FOREIGN KEY(`account_id`) REFERENCES `accounts`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "name",
|
|
||||||
"columnName": "name",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "color",
|
|
||||||
"columnName": "color",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "accountId",
|
|
||||||
"columnName": "account_id",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isVisible",
|
|
||||||
"columnName": "is_visible",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isSynced",
|
|
||||||
"columnName": "is_synced",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "owner",
|
|
||||||
"columnName": "owner",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isReadOnly",
|
|
||||||
"columnName": "is_read_only",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "sortOrder",
|
|
||||||
"columnName": "sort_order",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "href",
|
|
||||||
"columnName": "href",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "ctag",
|
|
||||||
"columnName": "ctag",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "syncToken",
|
|
||||||
"columnName": "sync_token",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isDirty",
|
|
||||||
"columnName": "is_dirty",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": true,
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"indices": [
|
|
||||||
{
|
|
||||||
"name": "index_task_lists_account_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"account_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_task_lists_account_id` ON `${TABLE_NAME}` (`account_id`)"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"foreignKeys": [
|
|
||||||
{
|
|
||||||
"table": "accounts",
|
|
||||||
"onDelete": "SET NULL",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"account_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "tasks",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `list_id` INTEGER NOT NULL, `uid` TEXT NOT NULL, `href` TEXT, `etag` TEXT, `title` TEXT, `description` TEXT, `location` TEXT, `url` TEXT, `color` INTEGER, `categories` TEXT NOT NULL DEFAULT '', `status` INTEGER NOT NULL DEFAULT 0, `percent_complete` INTEGER, `completed_at` INTEGER, `priority` INTEGER NOT NULL DEFAULT 0, `classification` INTEGER, `dtstart` INTEGER, `due` INTEGER, `duration` TEXT, `is_all_day` INTEGER NOT NULL DEFAULT 0, `timezone` TEXT, `rrule` TEXT, `rdate` TEXT, `exdate` TEXT, `recurrence_id` INTEGER, `master_id` INTEGER, `parent_id` INTEGER, `sort_order` INTEGER NOT NULL DEFAULT 0, `created_at` INTEGER, `last_modified` INTEGER, `sequence` INTEGER NOT NULL DEFAULT 0, `is_dirty` INTEGER NOT NULL DEFAULT 0, `is_deleted` INTEGER NOT NULL DEFAULT 0, `unknown_properties` TEXT, `reminders_off` INTEGER NOT NULL DEFAULT 0, FOREIGN KEY(`list_id`) REFERENCES `task_lists`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`master_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`parent_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "listId",
|
|
||||||
"columnName": "list_id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "uid",
|
|
||||||
"columnName": "uid",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "href",
|
|
||||||
"columnName": "href",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "etag",
|
|
||||||
"columnName": "etag",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "title",
|
|
||||||
"columnName": "title",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "description",
|
|
||||||
"columnName": "description",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "location",
|
|
||||||
"columnName": "location",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "url",
|
|
||||||
"columnName": "url",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "color",
|
|
||||||
"columnName": "color",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "categories",
|
|
||||||
"columnName": "categories",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "''"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "status",
|
|
||||||
"columnName": "status",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "percentComplete",
|
|
||||||
"columnName": "percent_complete",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "completedAt",
|
|
||||||
"columnName": "completed_at",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priority",
|
|
||||||
"columnName": "priority",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "classification",
|
|
||||||
"columnName": "classification",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "dtstart",
|
|
||||||
"columnName": "dtstart",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "due",
|
|
||||||
"columnName": "due",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "duration",
|
|
||||||
"columnName": "duration",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isAllDay",
|
|
||||||
"columnName": "is_all_day",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "timezone",
|
|
||||||
"columnName": "timezone",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "rrule",
|
|
||||||
"columnName": "rrule",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "rdate",
|
|
||||||
"columnName": "rdate",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "exdate",
|
|
||||||
"columnName": "exdate",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "recurrenceId",
|
|
||||||
"columnName": "recurrence_id",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "masterId",
|
|
||||||
"columnName": "master_id",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "parentId",
|
|
||||||
"columnName": "parent_id",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "sortOrder",
|
|
||||||
"columnName": "sort_order",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "createdAt",
|
|
||||||
"columnName": "created_at",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "lastModified",
|
|
||||||
"columnName": "last_modified",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "sequence",
|
|
||||||
"columnName": "sequence",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isDirty",
|
|
||||||
"columnName": "is_dirty",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isDeleted",
|
|
||||||
"columnName": "is_deleted",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unknownProperties",
|
|
||||||
"columnName": "unknown_properties",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "remindersOff",
|
|
||||||
"columnName": "reminders_off",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": true,
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"indices": [
|
|
||||||
{
|
|
||||||
"name": "index_tasks_list_id_is_deleted",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"list_id",
|
|
||||||
"is_deleted"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_tasks_list_id_is_deleted` ON `${TABLE_NAME}` (`list_id`, `is_deleted`)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "index_tasks_parent_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"parent_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_tasks_parent_id` ON `${TABLE_NAME}` (`parent_id`)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "index_tasks_master_id_recurrence_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"master_id",
|
|
||||||
"recurrence_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_tasks_master_id_recurrence_id` ON `${TABLE_NAME}` (`master_id`, `recurrence_id`)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "index_tasks_is_dirty",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"is_dirty"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_tasks_is_dirty` ON `${TABLE_NAME}` (`is_dirty`)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "index_tasks_list_id_uid_recurrence_id",
|
|
||||||
"unique": true,
|
|
||||||
"columnNames": [
|
|
||||||
"list_id",
|
|
||||||
"uid",
|
|
||||||
"recurrence_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_tasks_list_id_uid_recurrence_id` ON `${TABLE_NAME}` (`list_id`, `uid`, `recurrence_id`)"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"foreignKeys": [
|
|
||||||
{
|
|
||||||
"table": "task_lists",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"list_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"master_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "SET NULL",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"parent_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "task_alarms",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task_id` INTEGER NOT NULL, `minutes_before` INTEGER NOT NULL, `reference` TEXT NOT NULL DEFAULT 'DUE', `message` TEXT, `uid` TEXT NOT NULL DEFAULT '', `raw` TEXT, FOREIGN KEY(`task_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "taskId",
|
|
||||||
"columnName": "task_id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "minutesBefore",
|
|
||||||
"columnName": "minutes_before",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "reference",
|
|
||||||
"columnName": "reference",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "'DUE'"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "message",
|
|
||||||
"columnName": "message",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "uid",
|
|
||||||
"columnName": "uid",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "''"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "raw",
|
|
||||||
"columnName": "raw",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": true,
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"indices": [
|
|
||||||
{
|
|
||||||
"name": "index_task_alarms_task_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"task_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_task_alarms_task_id` ON `${TABLE_NAME}` (`task_id`)"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"foreignKeys": [
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"task_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "advanced_occurrences",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`copy_id` INTEGER NOT NULL, `master_id` INTEGER NOT NULL, `anchor` INTEGER NOT NULL, `advanced_to` INTEGER NOT NULL, `prior_dtstart` INTEGER, `prior_due` INTEGER, `prior_status` INTEGER NOT NULL, `prior_percent_complete` INTEGER, `prior_completed_at` INTEGER, `spent` INTEGER NOT NULL, `rule_after` TEXT, `dropped_exdates` TEXT NOT NULL DEFAULT '', `from_override` INTEGER NOT NULL, `undoable` INTEGER NOT NULL DEFAULT 1, `settled` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`copy_id`), FOREIGN KEY(`copy_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`master_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "copyId",
|
|
||||||
"columnName": "copy_id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "masterId",
|
|
||||||
"columnName": "master_id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "anchor",
|
|
||||||
"columnName": "anchor",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "advancedTo",
|
|
||||||
"columnName": "advanced_to",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priorDtstart",
|
|
||||||
"columnName": "prior_dtstart",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priorDue",
|
|
||||||
"columnName": "prior_due",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priorStatus",
|
|
||||||
"columnName": "prior_status",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priorPercentComplete",
|
|
||||||
"columnName": "prior_percent_complete",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priorCompletedAt",
|
|
||||||
"columnName": "prior_completed_at",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "spent",
|
|
||||||
"columnName": "spent",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "ruleAfter",
|
|
||||||
"columnName": "rule_after",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "droppedExdates",
|
|
||||||
"columnName": "dropped_exdates",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "''"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "fromOverride",
|
|
||||||
"columnName": "from_override",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "undoable",
|
|
||||||
"columnName": "undoable",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "settled",
|
|
||||||
"columnName": "settled",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": false,
|
|
||||||
"columnNames": [
|
|
||||||
"copy_id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"indices": [
|
|
||||||
{
|
|
||||||
"name": "index_advanced_occurrences_master_id_anchor",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"master_id",
|
|
||||||
"anchor"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_advanced_occurrences_master_id_anchor` ON `${TABLE_NAME}` (`master_id`, `anchor`)"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"foreignKeys": [
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"copy_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"master_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "advanced_detached",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `copy_id` INTEGER NOT NULL, `anchor` INTEGER NOT NULL, `task_id` INTEGER, FOREIGN KEY(`copy_id`) REFERENCES `advanced_occurrences`(`copy_id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`task_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "copyId",
|
|
||||||
"columnName": "copy_id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "anchor",
|
|
||||||
"columnName": "anchor",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "taskId",
|
|
||||||
"columnName": "task_id",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": true,
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"indices": [
|
|
||||||
{
|
|
||||||
"name": "index_advanced_detached_copy_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"copy_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_advanced_detached_copy_id` ON `${TABLE_NAME}` (`copy_id`)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "index_advanced_detached_task_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"task_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_advanced_detached_task_id` ON `${TABLE_NAME}` (`task_id`)"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"foreignKeys": [
|
|
||||||
{
|
|
||||||
"table": "advanced_occurrences",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"copy_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"copy_id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "SET NULL",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"task_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"setupQueries": [
|
|
||||||
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
|
|
||||||
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'fcb14ff68d892c72fa7459204276abb6')"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,775 +0,0 @@
|
|||||||
{
|
|
||||||
"formatVersion": 1,
|
|
||||||
"database": {
|
|
||||||
"version": 6,
|
|
||||||
"identityHash": "6c8058a22084f0af602bc2f23c949b3c",
|
|
||||||
"entities": [
|
|
||||||
{
|
|
||||||
"tableName": "accounts",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `display_name` TEXT NOT NULL, `principal_url` TEXT, `home_set_url` TEXT, `username` TEXT, `last_sync_at` INTEGER, `last_sync_error` TEXT, `label` TEXT)",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "displayName",
|
|
||||||
"columnName": "display_name",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "principalUrl",
|
|
||||||
"columnName": "principal_url",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "homeSetUrl",
|
|
||||||
"columnName": "home_set_url",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "username",
|
|
||||||
"columnName": "username",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "lastSyncAt",
|
|
||||||
"columnName": "last_sync_at",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "lastSyncError",
|
|
||||||
"columnName": "last_sync_error",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "label",
|
|
||||||
"columnName": "label",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": true,
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "task_lists",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `color` INTEGER NOT NULL, `account_id` INTEGER, `is_visible` INTEGER NOT NULL DEFAULT 1, `is_synced` INTEGER NOT NULL DEFAULT 1, `owner` TEXT, `is_read_only` INTEGER NOT NULL DEFAULT 0, `sort_order` INTEGER NOT NULL DEFAULT 0, `href` TEXT, `ctag` TEXT, `sync_token` TEXT, `is_dirty` INTEGER NOT NULL DEFAULT 0, FOREIGN KEY(`account_id`) REFERENCES `accounts`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "name",
|
|
||||||
"columnName": "name",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "color",
|
|
||||||
"columnName": "color",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "accountId",
|
|
||||||
"columnName": "account_id",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isVisible",
|
|
||||||
"columnName": "is_visible",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isSynced",
|
|
||||||
"columnName": "is_synced",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "owner",
|
|
||||||
"columnName": "owner",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isReadOnly",
|
|
||||||
"columnName": "is_read_only",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "sortOrder",
|
|
||||||
"columnName": "sort_order",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "href",
|
|
||||||
"columnName": "href",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "ctag",
|
|
||||||
"columnName": "ctag",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "syncToken",
|
|
||||||
"columnName": "sync_token",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isDirty",
|
|
||||||
"columnName": "is_dirty",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": true,
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"indices": [
|
|
||||||
{
|
|
||||||
"name": "index_task_lists_account_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"account_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_task_lists_account_id` ON `${TABLE_NAME}` (`account_id`)"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"foreignKeys": [
|
|
||||||
{
|
|
||||||
"table": "accounts",
|
|
||||||
"onDelete": "SET NULL",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"account_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "tasks",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `list_id` INTEGER NOT NULL, `uid` TEXT NOT NULL, `href` TEXT, `etag` TEXT, `title` TEXT, `description` TEXT, `location` TEXT, `url` TEXT, `color` INTEGER, `categories` TEXT NOT NULL DEFAULT '', `status` INTEGER NOT NULL DEFAULT 0, `percent_complete` INTEGER, `completed_at` INTEGER, `priority` INTEGER NOT NULL DEFAULT 0, `classification` INTEGER, `dtstart` INTEGER, `due` INTEGER, `duration` TEXT, `is_all_day` INTEGER NOT NULL DEFAULT 0, `timezone` TEXT, `rrule` TEXT, `rdate` TEXT, `exdate` TEXT, `recurrence_id` INTEGER, `master_id` INTEGER, `parent_id` INTEGER, `sort_order` INTEGER NOT NULL DEFAULT 0, `created_at` INTEGER, `last_modified` INTEGER, `sequence` INTEGER NOT NULL DEFAULT 0, `is_dirty` INTEGER NOT NULL DEFAULT 0, `is_deleted` INTEGER NOT NULL DEFAULT 0, `unknown_properties` TEXT, `reminders_off` INTEGER NOT NULL DEFAULT 0, FOREIGN KEY(`list_id`) REFERENCES `task_lists`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`master_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`parent_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "listId",
|
|
||||||
"columnName": "list_id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "uid",
|
|
||||||
"columnName": "uid",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "href",
|
|
||||||
"columnName": "href",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "etag",
|
|
||||||
"columnName": "etag",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "title",
|
|
||||||
"columnName": "title",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "description",
|
|
||||||
"columnName": "description",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "location",
|
|
||||||
"columnName": "location",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "url",
|
|
||||||
"columnName": "url",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "color",
|
|
||||||
"columnName": "color",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "categories",
|
|
||||||
"columnName": "categories",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "''"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "status",
|
|
||||||
"columnName": "status",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "percentComplete",
|
|
||||||
"columnName": "percent_complete",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "completedAt",
|
|
||||||
"columnName": "completed_at",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priority",
|
|
||||||
"columnName": "priority",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "classification",
|
|
||||||
"columnName": "classification",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "dtstart",
|
|
||||||
"columnName": "dtstart",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "due",
|
|
||||||
"columnName": "due",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "duration",
|
|
||||||
"columnName": "duration",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isAllDay",
|
|
||||||
"columnName": "is_all_day",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "timezone",
|
|
||||||
"columnName": "timezone",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "rrule",
|
|
||||||
"columnName": "rrule",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "rdate",
|
|
||||||
"columnName": "rdate",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "exdate",
|
|
||||||
"columnName": "exdate",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "recurrenceId",
|
|
||||||
"columnName": "recurrence_id",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "masterId",
|
|
||||||
"columnName": "master_id",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "parentId",
|
|
||||||
"columnName": "parent_id",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "sortOrder",
|
|
||||||
"columnName": "sort_order",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "createdAt",
|
|
||||||
"columnName": "created_at",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "lastModified",
|
|
||||||
"columnName": "last_modified",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "sequence",
|
|
||||||
"columnName": "sequence",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isDirty",
|
|
||||||
"columnName": "is_dirty",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "isDeleted",
|
|
||||||
"columnName": "is_deleted",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unknownProperties",
|
|
||||||
"columnName": "unknown_properties",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "remindersOff",
|
|
||||||
"columnName": "reminders_off",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": true,
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"indices": [
|
|
||||||
{
|
|
||||||
"name": "index_tasks_list_id_is_deleted",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"list_id",
|
|
||||||
"is_deleted"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_tasks_list_id_is_deleted` ON `${TABLE_NAME}` (`list_id`, `is_deleted`)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "index_tasks_parent_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"parent_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_tasks_parent_id` ON `${TABLE_NAME}` (`parent_id`)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "index_tasks_master_id_recurrence_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"master_id",
|
|
||||||
"recurrence_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_tasks_master_id_recurrence_id` ON `${TABLE_NAME}` (`master_id`, `recurrence_id`)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "index_tasks_is_dirty",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"is_dirty"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_tasks_is_dirty` ON `${TABLE_NAME}` (`is_dirty`)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "index_tasks_list_id_uid_recurrence_id",
|
|
||||||
"unique": true,
|
|
||||||
"columnNames": [
|
|
||||||
"list_id",
|
|
||||||
"uid",
|
|
||||||
"recurrence_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_tasks_list_id_uid_recurrence_id` ON `${TABLE_NAME}` (`list_id`, `uid`, `recurrence_id`)"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"foreignKeys": [
|
|
||||||
{
|
|
||||||
"table": "task_lists",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"list_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"master_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "SET NULL",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"parent_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "task_alarms",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `task_id` INTEGER NOT NULL, `minutes_before` INTEGER NOT NULL, `reference` TEXT NOT NULL DEFAULT 'DUE', `message` TEXT, `uid` TEXT NOT NULL DEFAULT '', `raw` TEXT, FOREIGN KEY(`task_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "taskId",
|
|
||||||
"columnName": "task_id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "minutesBefore",
|
|
||||||
"columnName": "minutes_before",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "reference",
|
|
||||||
"columnName": "reference",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "'DUE'"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "message",
|
|
||||||
"columnName": "message",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "uid",
|
|
||||||
"columnName": "uid",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "''"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "raw",
|
|
||||||
"columnName": "raw",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": true,
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"indices": [
|
|
||||||
{
|
|
||||||
"name": "index_task_alarms_task_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"task_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_task_alarms_task_id` ON `${TABLE_NAME}` (`task_id`)"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"foreignKeys": [
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"task_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "advanced_occurrences",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`copy_id` INTEGER NOT NULL, `master_id` INTEGER NOT NULL, `anchor` INTEGER NOT NULL, `advanced_to` INTEGER NOT NULL, `prior_dtstart` INTEGER, `prior_due` INTEGER, `prior_status` INTEGER NOT NULL, `prior_percent_complete` INTEGER, `prior_completed_at` INTEGER, `spent` INTEGER NOT NULL, `rule_after` TEXT, `dropped_exdates` TEXT NOT NULL DEFAULT '', `from_override` INTEGER NOT NULL, `undoable` INTEGER NOT NULL DEFAULT 1, `settled` INTEGER NOT NULL DEFAULT 0, `reset_subtasks` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`copy_id`), FOREIGN KEY(`copy_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`master_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "copyId",
|
|
||||||
"columnName": "copy_id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "masterId",
|
|
||||||
"columnName": "master_id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "anchor",
|
|
||||||
"columnName": "anchor",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "advancedTo",
|
|
||||||
"columnName": "advanced_to",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priorDtstart",
|
|
||||||
"columnName": "prior_dtstart",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priorDue",
|
|
||||||
"columnName": "prior_due",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priorStatus",
|
|
||||||
"columnName": "prior_status",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priorPercentComplete",
|
|
||||||
"columnName": "prior_percent_complete",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "priorCompletedAt",
|
|
||||||
"columnName": "prior_completed_at",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "spent",
|
|
||||||
"columnName": "spent",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "ruleAfter",
|
|
||||||
"columnName": "rule_after",
|
|
||||||
"affinity": "TEXT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "droppedExdates",
|
|
||||||
"columnName": "dropped_exdates",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "''"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "fromOverride",
|
|
||||||
"columnName": "from_override",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "undoable",
|
|
||||||
"columnName": "undoable",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "settled",
|
|
||||||
"columnName": "settled",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "resetSubtasks",
|
|
||||||
"columnName": "reset_subtasks",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true,
|
|
||||||
"defaultValue": "''"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": false,
|
|
||||||
"columnNames": [
|
|
||||||
"copy_id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"indices": [
|
|
||||||
{
|
|
||||||
"name": "index_advanced_occurrences_master_id_anchor",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"master_id",
|
|
||||||
"anchor"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_advanced_occurrences_master_id_anchor` ON `${TABLE_NAME}` (`master_id`, `anchor`)"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"foreignKeys": [
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"copy_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"master_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "advanced_detached",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `copy_id` INTEGER NOT NULL, `anchor` INTEGER NOT NULL, `task_id` INTEGER, FOREIGN KEY(`copy_id`) REFERENCES `advanced_occurrences`(`copy_id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`task_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "copyId",
|
|
||||||
"columnName": "copy_id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "anchor",
|
|
||||||
"columnName": "anchor",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "taskId",
|
|
||||||
"columnName": "task_id",
|
|
||||||
"affinity": "INTEGER"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"autoGenerate": true,
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"indices": [
|
|
||||||
{
|
|
||||||
"name": "index_advanced_detached_copy_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"copy_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_advanced_detached_copy_id` ON `${TABLE_NAME}` (`copy_id`)"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "index_advanced_detached_task_id",
|
|
||||||
"unique": false,
|
|
||||||
"columnNames": [
|
|
||||||
"task_id"
|
|
||||||
],
|
|
||||||
"orders": [],
|
|
||||||
"createSql": "CREATE INDEX IF NOT EXISTS `index_advanced_detached_task_id` ON `${TABLE_NAME}` (`task_id`)"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"foreignKeys": [
|
|
||||||
{
|
|
||||||
"table": "advanced_occurrences",
|
|
||||||
"onDelete": "CASCADE",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"copy_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"copy_id"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"table": "tasks",
|
|
||||||
"onDelete": "SET NULL",
|
|
||||||
"onUpdate": "NO ACTION",
|
|
||||||
"columns": [
|
|
||||||
"task_id"
|
|
||||||
],
|
|
||||||
"referencedColumns": [
|
|
||||||
"id"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"setupQueries": [
|
|
||||||
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
|
|
||||||
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '6c8058a22084f0af602bc2f23c949b3c')"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-76
@@ -1,76 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.tasks
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import androidx.test.core.app.ApplicationProvider
|
|
||||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
|
||||||
import com.google.common.truth.Truth.assertThat
|
|
||||||
import org.junit.After
|
|
||||||
import org.junit.Assume.assumeTrue
|
|
||||||
import org.junit.Before
|
|
||||||
import org.junit.Test
|
|
||||||
import org.junit.runner.RunWith
|
|
||||||
import java.util.concurrent.CountDownLatch
|
|
||||||
import java.util.concurrent.TimeUnit
|
|
||||||
|
|
||||||
/**
|
|
||||||
* List order against a real external provider (#136). Skipped unless one is
|
|
||||||
* installed and its permissions are granted.
|
|
||||||
*/
|
|
||||||
@RunWith(AndroidJUnit4::class)
|
|
||||||
class ExternalProviderListOrderTest {
|
|
||||||
|
|
||||||
private val context = ApplicationProvider.getApplicationContext<Context>()
|
|
||||||
private val resolver = ProviderResolver(AndroidProviderEnvironment(context)).apply {
|
|
||||||
storageMode = StorageMode.EXTERNAL
|
|
||||||
}
|
|
||||||
private val source = AndroidTasksDataSource(context, resolver)
|
|
||||||
private val created = mutableListOf<Long>()
|
|
||||||
|
|
||||||
@Before
|
|
||||||
fun setUp() {
|
|
||||||
val provider = resolver.resolve()
|
|
||||||
assumeTrue("no external tasks provider, or not granted", provider != null && resolver.hasPermission(provider))
|
|
||||||
listOf("Order A", "Order B", "Order C").forEach { created += source.createLocalList(it, 0) }
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
|
||||||
fun tearDown() = created.forEach { runCatching { source.deleteList(it) } }
|
|
||||||
|
|
||||||
private fun ours() = source.taskLists().map { it.id }.filter { it in created }
|
|
||||||
|
|
||||||
/** Waits until the provider has gone quiet, so a change seen afterwards is the test's own. */
|
|
||||||
private fun settle() {
|
|
||||||
var last = System.currentTimeMillis()
|
|
||||||
val observer = source.registerObserver { last = System.currentTimeMillis() }
|
|
||||||
while (System.currentTimeMillis() - last < 1_500) Thread.sleep(100)
|
|
||||||
observer.close()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aReorderIsKeptAndReported() {
|
|
||||||
val (a, b, c) = created
|
|
||||||
settle()
|
|
||||||
val changed = CountDownLatch(1)
|
|
||||||
val observer = source.registerObserver { changed.countDown() }
|
|
||||||
|
|
||||||
source.reorderLists(listOf(c, a, b))
|
|
||||||
|
|
||||||
assertThat(changed.await(5, TimeUnit.SECONDS)).isTrue()
|
|
||||||
observer.close()
|
|
||||||
assertThat(ours()).containsExactly(c, a, b).inOrder()
|
|
||||||
assertThat(AndroidTasksDataSource(context, resolver).taskLists().map { it.id }.filter { it in created })
|
|
||||||
.containsExactly(c, a, b).inOrder()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aDeletedListLeavesNoPositionBehind() {
|
|
||||||
val (a, b, c) = created
|
|
||||||
source.reorderLists(listOf(c, a, b))
|
|
||||||
|
|
||||||
source.deleteList(c)
|
|
||||||
created -= c
|
|
||||||
|
|
||||||
source.taskLists()
|
|
||||||
assertThat(source.storedListOrder().keys).doesNotContain(c)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-361
@@ -1,361 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.tasks
|
|
||||||
|
|
||||||
import android.content.ContentValues
|
|
||||||
import android.content.Context
|
|
||||||
import androidx.test.core.app.ApplicationProvider
|
|
||||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
|
||||||
import com.google.common.truth.Truth.assertThat
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TasksContract.Tasks
|
|
||||||
import de.jeanlucmakiola.agendula.domain.Task
|
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskForm
|
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskReminder
|
|
||||||
import org.junit.After
|
|
||||||
import org.junit.Assert.assertThrows
|
|
||||||
import org.junit.Assume.assumeTrue
|
|
||||||
import org.junit.Before
|
|
||||||
import org.junit.Test
|
|
||||||
import org.junit.runner.RunWith
|
|
||||||
import kotlin.time.Clock
|
|
||||||
import kotlin.time.Duration.Companion.hours
|
|
||||||
import kotlin.time.Duration.Companion.milliseconds
|
|
||||||
import kotlin.time.Instant
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recurrence against a real external provider (#135). Skipped unless one is
|
|
||||||
* installed and its permissions are granted, so it only runs where set up:
|
|
||||||
* `pm grant <app> org.tasks.permission.READ_TASKS` (and WRITE_TASKS).
|
|
||||||
*/
|
|
||||||
@RunWith(AndroidJUnit4::class)
|
|
||||||
class ExternalProviderRecurrenceTest {
|
|
||||||
|
|
||||||
private val context = ApplicationProvider.getApplicationContext<Context>()
|
|
||||||
private val resolver = ProviderResolver(AndroidProviderEnvironment(context)).apply {
|
|
||||||
storageMode = StorageMode.EXTERNAL
|
|
||||||
}
|
|
||||||
private val source = AndroidTasksDataSource(context, resolver)
|
|
||||||
private var listId = 0L
|
|
||||||
|
|
||||||
@Before
|
|
||||||
fun setUp() {
|
|
||||||
val provider = resolver.resolve()
|
|
||||||
assumeTrue("no external tasks provider, or not granted", provider != null && resolver.hasPermission(provider))
|
|
||||||
listId = source.createLocalList("Recurrence test", 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
|
||||||
fun tearDown() {
|
|
||||||
if (listId != 0L) source.deleteList(listId)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun dailyTask(): Long {
|
|
||||||
// Milliseconds and all, as the "start today" default gives.
|
|
||||||
val start = Clock.System.now() + 1.hours
|
|
||||||
return source.insertTask(
|
|
||||||
TaskForm(title = "Daily", listId = listId, start = start, due = start + 1.hours, rrule = "FREQ=DAILY"),
|
|
||||||
reminders = null,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun storedRule(taskId: Long): String? = context.contentResolver.query(
|
|
||||||
TasksContract.tasksUri(resolver.resolve()!!.authority),
|
|
||||||
arrayOf(Tasks.RRULE),
|
|
||||||
"${Tasks.ID} = ?",
|
|
||||||
arrayOf(taskId.toString()),
|
|
||||||
null,
|
|
||||||
)?.use { c -> if (c.moveToFirst()) c.getString(0) else null }
|
|
||||||
|
|
||||||
private fun setRule(taskId: Long, rule: String) {
|
|
||||||
context.contentResolver.update(
|
|
||||||
TasksContract.tasksUri(resolver.resolve()!!.authority),
|
|
||||||
ContentValues().apply { put(Tasks.RRULE, rule) },
|
|
||||||
"${Tasks.ID} = ?",
|
|
||||||
arrayOf(taskId.toString()),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aSeriesReadsAsRecurringWithItsRule() {
|
|
||||||
val id = dailyTask()
|
|
||||||
|
|
||||||
val listed = source.tasks(TaskQuery(listId = listId)).filter { it.taskId == id }.minBy { it.occurrenceStart!! }
|
|
||||||
assertThat(listed.isRecurring).isTrue()
|
|
||||||
assertThat(listed.isOccurrence).isTrue()
|
|
||||||
assertThat(listed.recurrenceRule).isEqualTo("FREQ=DAILY")
|
|
||||||
|
|
||||||
val opened = source.task(id)!!
|
|
||||||
assertThat(opened.recurrenceRule).isEqualTo("FREQ=DAILY")
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun savingTheSeriesKeepsItsRule() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val task = source.task(id)!!
|
|
||||||
|
|
||||||
source.updateSeries(
|
|
||||||
id,
|
|
||||||
task.occurrenceStart!!,
|
|
||||||
TaskForm(title = "Daily, renamed", listId = listId, start = task.start, due = task.due, rrule = task.recurrenceRule),
|
|
||||||
reminders = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
assertThat(storedRule(id)).isEqualTo("FREQ=DAILY")
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun completingAnOccurrenceMovesTheSeriesOn() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val task = source.task(id)!!
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, task.occurrenceStart!!, completed = true)
|
|
||||||
|
|
||||||
assertSeriesMovedOn(id, task.occurrenceStart!!)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aTickedOccurrenceReadsAsItsCopy() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val anchor = source.task(id)!!.occurrenceStart!!
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, anchor, completed = true)
|
|
||||||
|
|
||||||
val read = source.task(id, anchor)!!
|
|
||||||
assertThat(read.taskId).isNotEqualTo(id)
|
|
||||||
assertThat(read.isClosed).isTrue()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun undoingATickMovesTheSeriesBack() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val anchor = source.task(id)!!.occurrenceStart!!
|
|
||||||
source.setCompletedInstance(id, anchor, completed = true)
|
|
||||||
val copy = source.task(id, anchor)!!.taskId
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, anchor, completed = false)
|
|
||||||
|
|
||||||
val read = source.task(id, anchor)!!
|
|
||||||
assertThat(read.taskId).isEqualTo(id)
|
|
||||||
assertThat(read.isClosed).isFalse()
|
|
||||||
assertThat(source.task(copy)).isNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun reopeningTheCopyItselfMovesTheSeriesBack() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val anchor = source.task(id)!!.occurrenceStart!!
|
|
||||||
source.setCompletedInstance(id, anchor, completed = true)
|
|
||||||
val copy = source.task(id, anchor)!!.taskId
|
|
||||||
|
|
||||||
source.setCompleted(copy, completed = false)
|
|
||||||
|
|
||||||
assertThat(source.task(id, anchor)!!.taskId).isEqualTo(id)
|
|
||||||
assertThat(source.task(copy)).isNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aSeriesChangedSinceTheTickReopensOnlyTheCopy() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val anchor = source.task(id)!!.occurrenceStart!!
|
|
||||||
source.setCompletedInstance(id, anchor, completed = true)
|
|
||||||
val copy = source.task(id, anchor)!!.taskId
|
|
||||||
setRule(id, "FREQ=WEEKLY")
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, anchor, completed = false)
|
|
||||||
|
|
||||||
assertThat(source.task(copy)!!.isClosed).isFalse()
|
|
||||||
assertThat(storedRule(id)).isEqualTo("FREQ=WEEKLY")
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun anOccurrenceThatIsGoneReadsAsNothing() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val anchor = source.task(id)!!.occurrenceStart!!
|
|
||||||
|
|
||||||
assertThat(source.task(id, anchor + 30.hours)).isNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aSeriesStoredWithMillisecondsStillMovesOn() {
|
|
||||||
val id = legacySeries()
|
|
||||||
val task = source.task(id)!!
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, task.occurrenceStart!!, completed = true)
|
|
||||||
|
|
||||||
assertSeriesMovedOn(id, task.occurrenceStart)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun anUnknownOccurrenceDoesNotCloseTheSeries() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val anchor = source.task(id)!!.occurrenceStart!!
|
|
||||||
|
|
||||||
assertThrows(TaskWriteFailedException::class.java) {
|
|
||||||
source.setCompletedInstance(id, anchor + 30.hours, completed = true)
|
|
||||||
}
|
|
||||||
|
|
||||||
assertThat(source.task(id)!!.isClosed).isFalse()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun roundingALegacySeriesLeavesItUnmodified() {
|
|
||||||
val id = legacySeries()
|
|
||||||
val before = storedColumn(id, Tasks.LAST_MODIFIED)
|
|
||||||
|
|
||||||
source.task(id)
|
|
||||||
|
|
||||||
assertThat(storedStart(id)!! % 1000).isEqualTo(0L)
|
|
||||||
assertThat(storedColumn(id, Tasks.LAST_MODIFIED)).isEqualTo(before)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** A daily series as builds before whole-second writes left it, already in sync with its server. */
|
|
||||||
private fun legacySeries(): Long {
|
|
||||||
val start = (Clock.System.now() + 1.hours).toEpochMilliseconds() / 1000 * 1000
|
|
||||||
return insertAsSyncAdapter(
|
|
||||||
Tasks.LIST_ID to listId,
|
|
||||||
Tasks.TITLE to "Old daily",
|
|
||||||
Tasks.DTSTART to start + 345,
|
|
||||||
Tasks.DUE to start + 3_600_345,
|
|
||||||
Tasks.TZ to "UTC",
|
|
||||||
Tasks.RRULE to "FREQ=DAILY",
|
|
||||||
).also {
|
|
||||||
// The app's own reads may already have run the one-time rounding.
|
|
||||||
context.getSharedPreferences("provider_migrations", Context.MODE_PRIVATE).edit().clear().commit()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun insertAsSyncAdapter(vararg values: Pair<String, Any>): Long {
|
|
||||||
val uri = TasksContract.asSyncAdapter(
|
|
||||||
TasksContract.tasksUri(resolver.resolve()!!.authority),
|
|
||||||
TasksContract.LOCAL_ACCOUNT_NAME,
|
|
||||||
TasksContract.LOCAL_ACCOUNT_TYPE,
|
|
||||||
)
|
|
||||||
val cv = ContentValues().apply {
|
|
||||||
values.forEach { (k, v) -> if (v is Long) put(k, v) else put(k, v.toString()) }
|
|
||||||
}
|
|
||||||
return context.contentResolver.insert(uri, cv)!!.lastPathSegment!!.toLong()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Edits the series' first occurrence on its own and returns the override that makes. */
|
|
||||||
private fun overrideOf(id: Long): Task {
|
|
||||||
val task = source.task(id)!!
|
|
||||||
source.updateInstance(
|
|
||||||
id,
|
|
||||||
task.occurrenceStart!!,
|
|
||||||
TaskForm(title = "Just this once", listId = listId, start = task.start, due = task.due),
|
|
||||||
reminders = null,
|
|
||||||
)
|
|
||||||
return source.tasks(TaskQuery(listId = listId)).single { it.seriesId == id && it.taskId != id }
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun anOverrideBelongsToItsSeries() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val anchor = source.task(id)!!.occurrenceStart
|
|
||||||
|
|
||||||
val override = overrideOf(id)
|
|
||||||
|
|
||||||
assertThat(override.title).isEqualTo("Just this once")
|
|
||||||
assertThat(override.isOccurrence).isTrue()
|
|
||||||
assertThat(override.occurrenceStart).isEqualTo(anchor)
|
|
||||||
assertThat(override.recurrenceRule).isEqualTo("FREQ=DAILY")
|
|
||||||
assertThat(source.task(override.taskId, override.occurrenceStart)?.taskId).isEqualTo(override.taskId)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun anAllDayDueAddedToTheSeriesStaysOnItsDay() {
|
|
||||||
val day = Clock.System.now().toEpochMilliseconds() / 86_400_000 * 86_400_000
|
|
||||||
val id = source.insertTask(
|
|
||||||
TaskForm(title = "All day", listId = listId, start = Instant.fromEpochMilliseconds(day), isAllDay = true, rrule = "FREQ=DAILY"),
|
|
||||||
reminders = null,
|
|
||||||
)
|
|
||||||
val task = source.task(id)!!
|
|
||||||
// Local midnight the next day, as the date picker hands it over.
|
|
||||||
val localMidnight = Instant.fromEpochMilliseconds(day + 86_400_000 - java.util.TimeZone.getDefault().getOffset(day))
|
|
||||||
|
|
||||||
source.updateSeries(
|
|
||||||
id,
|
|
||||||
task.occurrenceStart!!,
|
|
||||||
TaskForm(title = "All day", listId = listId, start = task.start, due = localMidnight, isAllDay = true, rrule = "FREQ=DAILY"),
|
|
||||||
reminders = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
assertThat(storedColumn(id, Tasks.DUE)!!.toLong() % 86_400_000).isEqualTo(0L)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun savingAllFromAnOverrideKeepsTheSeriesWhereItIs() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val before = storedStart(id)
|
|
||||||
val override = overrideOf(id)
|
|
||||||
|
|
||||||
source.updateSeries(
|
|
||||||
id,
|
|
||||||
override.occurrenceStart!!,
|
|
||||||
TaskForm(title = "Renamed", listId = listId, start = override.start, due = override.due, rrule = override.recurrenceRule),
|
|
||||||
reminders = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
assertThat(storedStart(id)).isEqualTo(before)
|
|
||||||
assertThat(storedRule(id)).isEqualTo("FREQ=DAILY")
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun deletingAnOverrideExcludesItsOccurrence() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val override = overrideOf(id)
|
|
||||||
|
|
||||||
source.deleteOverride(override.taskId, override.occurrenceStart!!)
|
|
||||||
|
|
||||||
// Excluded on the master, not just the override dropped.
|
|
||||||
assertThat(storedColumn(id, Tasks.EXDATE)).isNotNull()
|
|
||||||
val open = source.tasks(TaskQuery(listId = listId)).filter { it.seriesId == id }
|
|
||||||
assertThat(open.map { it.occurrenceStart }).doesNotContain(override.occurrenceStart)
|
|
||||||
assertThat(storedRule(id)).isEqualTo("FREQ=DAILY")
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun editingAnOverrideAgainKeepsItsNewTagsAndReminders() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val override = overrideOf(id)
|
|
||||||
val form = TaskForm(
|
|
||||||
title = override.title,
|
|
||||||
listId = listId,
|
|
||||||
start = override.start,
|
|
||||||
due = override.due,
|
|
||||||
tags = listOf("urgent"),
|
|
||||||
reminders = listOf(TaskReminder(minutesBefore = 15)),
|
|
||||||
)
|
|
||||||
|
|
||||||
source.updateInstance(override.taskId, override.occurrenceStart!!, form, form.reminders)
|
|
||||||
|
|
||||||
assertThat(source.task(override.taskId)!!.tags).containsExactly("urgent")
|
|
||||||
assertThat(source.reminders()[override.taskId]).containsExactly(TaskReminder(minutesBefore = 15))
|
|
||||||
assertThat(source.task(id)?.tags.orEmpty()).isEmpty()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun anOccurrenceIsFoundByItsAnchorToTheSecond() {
|
|
||||||
val id = dailyTask()
|
|
||||||
val override = overrideOf(id)
|
|
||||||
|
|
||||||
val found = source.task(id, override.occurrenceStart!! + 345.milliseconds)
|
|
||||||
|
|
||||||
assertThat(found?.taskId).isEqualTo(override.taskId)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun storedStart(taskId: Long): Long? = storedColumn(taskId, Tasks.DTSTART)?.toLong()
|
|
||||||
|
|
||||||
private fun storedColumn(taskId: Long, column: String): String? = context.contentResolver.query(
|
|
||||||
TasksContract.tasksUri(resolver.resolve()!!.authority),
|
|
||||||
arrayOf(column),
|
|
||||||
"${Tasks.ID} = ?",
|
|
||||||
arrayOf(taskId.toString()),
|
|
||||||
null,
|
|
||||||
)?.use { c -> if (c.moveToFirst()) c.getString(0) else null }
|
|
||||||
|
|
||||||
private fun assertSeriesMovedOn(id: Long, completed: Instant) {
|
|
||||||
assertThat(storedRule(id)).isNotNull()
|
|
||||||
val open = source.tasks(TaskQuery(listId = listId)).filter { it.seriesId == id }
|
|
||||||
assertThat(open).isNotEmpty()
|
|
||||||
assertThat(open.minOf { it.occurrenceStart!! }).isGreaterThan(completed)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-5
@@ -124,7 +124,6 @@ class AgendulaTaskProviderTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun aBadWriteReachesTheClientAsIllegalArgument() {
|
fun aBadWriteReachesTheClientAsIllegalArgument() {
|
||||||
assumeTrue("Agendula is running on an external provider", ownStore())
|
|
||||||
// No list has this id, so nothing in the app's real store is touched.
|
// No list has this id, so nothing in the app's real store is touched.
|
||||||
val values = ContentValues().apply {
|
val values = ContentValues().apply {
|
||||||
put("list_id", Long.MAX_VALUE)
|
put("list_id", Long.MAX_VALUE)
|
||||||
@@ -136,7 +135,6 @@ class AgendulaTaskProviderTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun aFailingBatchWritesNothing() {
|
fun aFailingBatchWritesNothing() {
|
||||||
assumeTrue("Agendula is running on an external provider", ownStore())
|
|
||||||
val missingList = Long.MAX_VALUE
|
val missingList = Long.MAX_VALUE
|
||||||
val operations = arrayListOf(
|
val operations = arrayListOf(
|
||||||
ContentProviderOperation.newInsert(uri("tasks")).withValue("list_id", missingList).withValue("title", "a").build(),
|
ContentProviderOperation.newInsert(uri("tasks")).withValue("list_id", missingList).withValue("title", "a").build(),
|
||||||
@@ -147,9 +145,6 @@ class AgendulaTaskProviderTest {
|
|||||||
.use { assertThat(it.count).isEqualTo(0) }
|
.use { assertThat(it.count).isEqualTo(0) }
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Whether the app's own store is active: only then does the provider take writes at all. */
|
|
||||||
private fun ownStore() = runCatching { resolver.delete(uri("tasks"), "_id = -1", null) }.isSuccess
|
|
||||||
|
|
||||||
/** stdout and stderr of [command]; the denial lands on stderr. */
|
/** stdout and stderr of [command]; the denial lands on stderr. */
|
||||||
private fun shell(command: String): String {
|
private fun shell(command: String): String {
|
||||||
val (stdout, stdin, stderr) = InstrumentationRegistry.getInstrumentation().uiAutomation
|
val (stdout, stdin, stderr) = InstrumentationRegistry.getInstrumentation().uiAutomation
|
||||||
|
|||||||
+2
-18
@@ -734,11 +734,9 @@ class ProviderWriterTest {
|
|||||||
val series = db.tasks().insert(
|
val series = db.tasks().insert(
|
||||||
TaskEntity(listId = home, uid = "f", title = "Floating", due = today, rrule = "FREQ=DAILY;COUNT=3", timezone = null),
|
TaskEntity(listId = home, uid = "f", title = "Floating", due = today, rrule = "FREQ=DAILY;COUNT=3", timezone = null),
|
||||||
)
|
)
|
||||||
// The second occurrence: ticking the first moves the series on instead.
|
val row = readRow(ProviderTable.INSTANCES, instanceId(today))
|
||||||
val second = today + 1.days
|
|
||||||
val row = readRow(ProviderTable.INSTANCES, instanceId(second))
|
|
||||||
|
|
||||||
writer.update(ProviderTable.INSTANCES, row + (Tasks.STATUS to 2), byId(ProviderTable.INSTANCES, instanceId(second)), null)
|
writer.update(ProviderTable.INSTANCES, row + (Tasks.STATUS to 2), byId(ProviderTable.INSTANCES, instanceId(today)), null)
|
||||||
writer.update(ProviderTable.TASKS, mapOf(Tasks.TITLE to "Still floating"), byId(ProviderTable.TASKS, series), null)
|
writer.update(ProviderTable.TASKS, mapOf(Tasks.TITLE to "Still floating"), byId(ProviderTable.TASKS, series), null)
|
||||||
|
|
||||||
assertThat(db.tasks().overrides(series).single().status).isEqualTo(TaskStatus.COMPLETED)
|
assertThat(db.tasks().overrides(series).single().status).isEqualTo(TaskStatus.COMPLETED)
|
||||||
@@ -797,20 +795,6 @@ class ProviderWriterTest {
|
|||||||
|
|
||||||
private fun store() = RoomTasksDataSource(db)
|
private fun store() = RoomTasksDataSource(db)
|
||||||
|
|
||||||
@Test
|
|
||||||
fun reopeningATickedOccurrencesCopyMovesTheSeriesBack() {
|
|
||||||
val series = db.tasks().insert(
|
|
||||||
TaskEntity(listId = home, uid = "w", title = "Weekly", dtstart = today, rrule = "FREQ=WEEKLY", timezone = "UTC"),
|
|
||||||
)
|
|
||||||
store().setCompletedInstance(series, today, true)
|
|
||||||
val copy = db.tasks().allIn(home).single { it.id != series }
|
|
||||||
|
|
||||||
writer.update(ProviderTable.TASKS, mapOf(Tasks.STATUS to 0), byId(ProviderTable.TASKS, copy.id), null)
|
|
||||||
|
|
||||||
assertThat(task(series)!!.dtstart).isEqualTo(today)
|
|
||||||
assertThat(task(copy.id)).isNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Every column of one published row, as a client that read it would write it back. */
|
/** Every column of one published row, as a client that read it would write it back. */
|
||||||
private fun readRow(table: ProviderTable, id: Long): Map<String, Any?> {
|
private fun readRow(table: ProviderTable, id: Long): Map<String, Any?> {
|
||||||
val columns = table.columns.map { it.first }
|
val columns = table.columns.map { it.first }
|
||||||
|
|||||||
+5
-800
@@ -14,7 +14,6 @@ import org.junit.Test
|
|||||||
import org.junit.runner.RunWith
|
import org.junit.runner.RunWith
|
||||||
import kotlin.time.Clock
|
import kotlin.time.Clock
|
||||||
import kotlin.time.Duration.Companion.days
|
import kotlin.time.Duration.Companion.days
|
||||||
import kotlin.time.Duration.Companion.hours
|
|
||||||
import kotlin.time.Instant
|
import kotlin.time.Instant
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -212,8 +211,7 @@ class RoomTasksDataSourceTest {
|
|||||||
@Test
|
@Test
|
||||||
fun completingOneOccurrenceLeavesTheRestOfTheSeriesOpen() {
|
fun completingOneOccurrenceLeavesTheRestOfTheSeriesOpen() {
|
||||||
val id = source.insertTask(form(title = "Water the plants"))
|
val id = source.insertTask(form(title = "Water the plants"))
|
||||||
// Overdue occurrences before it, so it is not the first and forks an override.
|
makeRecurring(id, now)
|
||||||
makeRecurring(id, now - 14.days)
|
|
||||||
val open = { source.tasks(TaskQuery(listId = listId)).filter { it.taskId == id } }
|
val open = { source.tasks(TaskQuery(listId = listId)).filter { it.taskId == id } }
|
||||||
val before = open()
|
val before = open()
|
||||||
val target = before.first { it.distanceFromCurrent == 0 }
|
val target = before.first { it.distanceFromCurrent == 0 }
|
||||||
@@ -239,8 +237,7 @@ class RoomTasksDataSourceTest {
|
|||||||
@Test
|
@Test
|
||||||
fun reopeningACompletedOccurrenceReusesItsOverride() {
|
fun reopeningACompletedOccurrenceReusesItsOverride() {
|
||||||
val id = source.insertTask(form(title = "Water the plants"))
|
val id = source.insertTask(form(title = "Water the plants"))
|
||||||
// Overdue occurrences before it, so it is not the first and forks an override.
|
makeRecurring(id, now)
|
||||||
makeRecurring(id, now - 14.days)
|
|
||||||
val target = source.tasks(TaskQuery(listId = listId))
|
val target = source.tasks(TaskQuery(listId = listId))
|
||||||
.first { it.taskId == id && it.distanceFromCurrent == 0 }
|
.first { it.taskId == id && it.distanceFromCurrent == 0 }
|
||||||
|
|
||||||
@@ -257,8 +254,7 @@ class RoomTasksDataSourceTest {
|
|||||||
@Test
|
@Test
|
||||||
fun cancellingOneOccurrenceLeavesTheRestOfTheSeriesOpen() {
|
fun cancellingOneOccurrenceLeavesTheRestOfTheSeriesOpen() {
|
||||||
val id = source.insertTask(form(title = "Water the plants"))
|
val id = source.insertTask(form(title = "Water the plants"))
|
||||||
// Overdue occurrences before it, so it is not the first and forks an override.
|
makeRecurring(id, now)
|
||||||
makeRecurring(id, now - 14.days)
|
|
||||||
val target = source.tasks(TaskQuery(listId = listId))
|
val target = source.tasks(TaskQuery(listId = listId))
|
||||||
.first { it.taskId == id && it.distanceFromCurrent == 0 }
|
.first { it.taskId == id && it.distanceFromCurrent == 0 }
|
||||||
|
|
||||||
@@ -273,795 +269,6 @@ class RoomTasksDataSourceTest {
|
|||||||
assertThat(db.tasks().override(id, target.occurrenceStart)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
assertThat(db.tasks().override(id, target.occurrenceStart)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
fun completingTheFirstOccurrenceMovesTheSeriesOnAndKeepsACopy() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Water the plants"))
|
|
||||||
makeRecurring(id, at, rule = "FREQ=WEEKLY;COUNT=4")
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
assertThat(master.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(master.dtstart).isEqualTo(at + 7.days)
|
|
||||||
assertThat(master.due).isEqualTo(at + 8.days)
|
|
||||||
assertThat(master.rrule).isEqualTo("FREQ=WEEKLY;COUNT=3")
|
|
||||||
assertThat(master.isDirty).isTrue()
|
|
||||||
assertThat(db.tasks().overrides(id)).isEmpty()
|
|
||||||
val copy = db.tasks().allIn(listId).single { it.id != id }
|
|
||||||
assertThat(copy.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
assertThat(copy.uid).isNotEqualTo(master.uid)
|
|
||||||
assertThat(copy.rrule).isNull()
|
|
||||||
assertThat(copy.masterId).isNull()
|
|
||||||
assertThat(copy.dtstart).isEqualTo(at)
|
|
||||||
assertThat(copy.title).isEqualTo("Water the plants")
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun reopeningTheOccurrenceMovesTheSeriesBack() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Water the plants"))
|
|
||||||
makeRecurring(id, at, rule = "FREQ=WEEKLY;COUNT=4")
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
assertThat(master.dtstart).isEqualTo(at)
|
|
||||||
assertThat(master.rrule).isEqualTo("FREQ=WEEKLY;COUNT=4")
|
|
||||||
assertThat(db.tasks().allIn(listId).filter { !it.isDeleted }.map { it.id }).containsExactly(id)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun completingAnEditedFirstOccurrenceKeepsItsEdits() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Water the plants"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.updateInstance(id, at, TaskForm(title = "Water the cactus", listId = listId, start = at, due = at + 1.days), reminders = null)
|
|
||||||
val override = db.tasks().override(id, at)!!
|
|
||||||
|
|
||||||
source.setCompletedInstance(override.id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().overrides(id)).isEmpty()
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 7.days)
|
|
||||||
val copy = db.tasks().allIn(listId).single { it.id != id }
|
|
||||||
assertThat(copy.title).isEqualTo("Water the cactus")
|
|
||||||
assertThat(copy.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun completingTheLastOccurrenceClosesTheSeries() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Water the plants"))
|
|
||||||
makeRecurring(id, at, rule = "FREQ=WEEKLY;COUNT=1")
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
assertThat(db.tasks().allIn(listId).map { it.id }).containsExactly(id)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun cancellingTheFirstOccurrenceMovesTheSeriesOn() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Water the plants"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
|
|
||||||
source.setCancelledInstance(id, at, cancelled = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 7.days)
|
|
||||||
assertThat(db.tasks().allIn(listId).single { it.id != id }.status).isEqualTo(TaskStatus.CANCELLED)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aSeriesWhoseStartWasDeletedMovesPastTheTickedOne() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.deleteOccurrence(id, at)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at + 7.days, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 14.days)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun countSpendsExcludedOccurrencesAndReopeningRestoresThem() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Daily"))
|
|
||||||
makeRecurring(id, at, rule = "FREQ=DAILY;COUNT=4")
|
|
||||||
source.deleteOccurrence(id, at + 1.days)
|
|
||||||
val before = db.tasks().entity(id)!!
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
val moved = db.tasks().entity(id)!!
|
|
||||||
assertThat(moved.dtstart).isEqualTo(at + 2.days)
|
|
||||||
assertThat(moved.rrule).isEqualTo("FREQ=DAILY;COUNT=2")
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
val back = db.tasks().entity(id)!!
|
|
||||||
assertThat(back.dtstart).isEqualTo(before.dtstart)
|
|
||||||
assertThat(back.rrule).isEqualTo(before.rrule)
|
|
||||||
assertThat(back.exdate).isEqualTo(before.exdate)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun reopeningTheCopyItselfMovesTheSeriesBack() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
val copy = db.tasks().allIn(listId).single { it.id != id }
|
|
||||||
|
|
||||||
source.setCompleted(copy.id, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
assertThat(db.tasks().allIn(listId).filter { !it.isDeleted }.map { it.id }).containsExactly(id)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun undoingAnEditedOccurrenceBringsItsOverrideBack() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.updateInstance(id, at, TaskForm(title = "Just this once", listId = listId, start = at, due = at + 1.days), reminders = null)
|
|
||||||
val override = db.tasks().override(id, at)!!
|
|
||||||
source.setCompletedInstance(override.id, at, completed = true)
|
|
||||||
|
|
||||||
source.setCompletedInstance(override.id, at, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
val back = db.tasks().override(id, at)!!
|
|
||||||
assertThat(back.title).isEqualTo("Just this once")
|
|
||||||
assertThat(back.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aStaleTickOfAnOccurrenceMovedPastForksNothing() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().overrides(id)).isEmpty()
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 7.days)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun occurrencesClosedBeforeTheUpdateNoLongerHoldTheSeriesBack() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
db.tasks().insert(
|
|
||||||
master.copy(id = 0, masterId = id, recurrenceId = at, rrule = null, status = TaskStatus.COMPLETED, completedAt = at),
|
|
||||||
)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at + 7.days, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 14.days)
|
|
||||||
assertThat(db.tasks().overrides(id)).isEmpty()
|
|
||||||
assertThat(db.tasks().allIn(listId).count { it.id != id && it.status == TaskStatus.COMPLETED }).isEqualTo(2)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun theTickedOccurrenceStillResolvesToItsCopy() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val occurrence = source.task(id, at)!!.occurrenceStart!!
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, occurrence, completed = true)
|
|
||||||
|
|
||||||
val found = source.task(id, occurrence)!!
|
|
||||||
assertThat(found.taskId).isNotEqualTo(id)
|
|
||||||
assertThat(found.isCompleted).isTrue()
|
|
||||||
assertThat(found.occurrenceStart).isEqualTo(occurrence)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun theNextOccurrenceStartsWithoutTheLastOnesProgress() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
db.tasks().update(db.tasks().entity(id)!!.copy(status = TaskStatus.IN_PROCESS, percentComplete = 60))
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
assertThat(master.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(master.percentComplete).isNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun theCopyOfAnEditedOccurrenceKeepsItsOwnProperties() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
val override = db.tasks().insert(
|
|
||||||
master.copy(id = 0, masterId = id, recurrenceId = at, rrule = null, unknownProperties = "COMMENT:only this one"),
|
|
||||||
)
|
|
||||||
|
|
||||||
source.setCompletedInstance(override, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(override)!!.unknownProperties!!.lines()).contains("COMMENT:only this one")
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aRuleWithAGapOfMoreThanTenYearsKeepsGoing() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Rare"))
|
|
||||||
makeRecurring(id, at, rule = "FREQ=YEARLY;INTERVAL=11")
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
assertThat(master.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(master.dtstart!!).isGreaterThan(at + (366 * 10).days)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun reopeningKeepsWhatChangedOnTheSeriesSince() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
source.deleteOccurrence(id, at + 28.days)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
assertThat(master.dtstart).isEqualTo(at)
|
|
||||||
assertThat(master.exdate).isNotNull()
|
|
||||||
assertThat(source.tasks(TaskQuery(listId = listId)).map { it.occurrenceStart?.epochSeconds })
|
|
||||||
.doesNotContain((at + 28.days).epochSeconds)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aSeriesWithExtraDatesKeepsTheOverrideModel() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
db.tasks().update(db.tasks().entity(id)!!.copy(rdate = "20991231T090000Z"))
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
assertThat(db.tasks().overrides(id).single().status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aDeletedSeriesIsNotBroughtBackByItsCopy() {
|
|
||||||
val at = now
|
|
||||||
val work = syncedList()
|
|
||||||
val id = source.insertTask(form(title = "Weekly").copy(listId = work))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
val copy = db.tasks().allIn(work).single { it.id != id }
|
|
||||||
source.deleteWithSubtasks(id)
|
|
||||||
|
|
||||||
source.setCompleted(copy.id, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(copy.id)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(db.tasks().entity(copy.id)!!.isDeleted).isFalse()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aSeriesEndedOnItsLastOpenOccurrenceReopens() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Three"))
|
|
||||||
makeRecurring(id, at, rule = "FREQ=WEEKLY;COUNT=3")
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
listOf(at, at + 7.days).forEach { done ->
|
|
||||||
db.tasks().insert(master.copy(id = 0, masterId = id, recurrenceId = done, rrule = null, status = TaskStatus.COMPLETED))
|
|
||||||
}
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at + 14.days, completed = true)
|
|
||||||
assertThat(db.tasks().entity(id)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
// Nothing to move past: the closed occurrences stay the series' own.
|
|
||||||
assertThat(db.tasks().overrides(id)).hasSize(2)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at + 14.days, completed = false)
|
|
||||||
assertThat(db.tasks().entity(id)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun reopeningAnOlderCopyReopensItOnItsOwn() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
source.setCompletedInstance(id, at + 7.days, completed = true)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 14.days)
|
|
||||||
val reopened = db.tasks().allIn(listId).single { it.id != id && it.dtstart == at }
|
|
||||||
assertThat(reopened.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(db.advancedOccurrences().forCopy(reopened.id)!!.undoable).isFalse()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aSeriesMovesPastOccurrencesAlreadyClosedAfterIt() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
db.tasks().insert(master.copy(id = 0, masterId = id, recurrenceId = at + 7.days, rrule = null, status = TaskStatus.COMPLETED))
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 14.days)
|
|
||||||
assertThat(db.tasks().overrides(id)).isEmpty()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aDetachedOccurrenceDeletedSinceStaysExcluded() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
val earlier = db.tasks().insert(master.copy(id = 0, masterId = id, recurrenceId = at, rrule = null, status = TaskStatus.COMPLETED))
|
|
||||||
source.setCompletedInstance(id, at + 7.days, completed = true)
|
|
||||||
source.deleteTask(earlier)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at + 7.days, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
assertThat(source.tasks(TaskQuery(listId = listId)).map { it.occurrenceStart?.epochSeconds })
|
|
||||||
.doesNotContain(at.epochSeconds)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aNestedComponentKeepsItsOwnUid() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
val override = db.tasks().insert(
|
|
||||||
master.copy(
|
|
||||||
id = 0, masterId = id, recurrenceId = at, rrule = null,
|
|
||||||
unknownProperties = "BEGIN:VALARM\r\nUID:alarm-1\r\nACTION:AUDIO\r\nEND:VALARM",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
source.setCompletedInstance(override, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(override)!!.unknownProperties!!.lines()).contains("UID:alarm-1")
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun reopeningTheCopyInTheEditorMovesTheSeriesBack() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
val copy = db.tasks().allIn(listId).single { it.id != id }
|
|
||||||
|
|
||||||
source.updateTask(
|
|
||||||
copy.id,
|
|
||||||
TaskForm(title = copy.title.orEmpty(), listId = listId, start = copy.dtstart, due = copy.due, percentComplete = 0),
|
|
||||||
reminders = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun anEditedCopyReopensAsATaskOfItsOwn() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
val copy = db.tasks().allIn(listId).single { it.id != id }
|
|
||||||
db.tasks().update(copy.copy(description = "notes"))
|
|
||||||
source.updateTask(copy.id, TaskForm(title = "Renamed", listId = listId, start = copy.dtstart, due = copy.due, percentComplete = 100), null)
|
|
||||||
|
|
||||||
source.setCompleted(copy.id, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 7.days)
|
|
||||||
assertThat(db.tasks().entity(copy.id)!!.title).isEqualTo("Renamed")
|
|
||||||
assertThat(db.tasks().entity(copy.id)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aCopyWithASubtaskReopensOnItsOwn() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
val copy = db.tasks().allIn(listId).single { it.id != id }
|
|
||||||
source.insertTask(form(title = "Part").copy(parentId = copy.id))
|
|
||||||
|
|
||||||
source.setCompleted(copy.id, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 7.days)
|
|
||||||
assertThat(db.tasks().entity(copy.id)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aRecurringSubtaskKeepsTheOverrideModel() {
|
|
||||||
val at = now
|
|
||||||
val parent = source.insertTask(form(title = "Parent"))
|
|
||||||
val id = source.insertTask(form(title = "Daily part").copy(parentId = parent))
|
|
||||||
makeRecurring(id, at, rule = "FREQ=DAILY")
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
assertThat(db.tasks().overrides(id)).hasSize(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun movingARoutineOnReopensItsCompletedSubtasks() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Routine"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val done = source.insertTask(form(title = "Step").copy(parentId = id))
|
|
||||||
val nested = source.insertTask(form(title = "Nested").copy(parentId = done))
|
|
||||||
val cancelled = source.insertTask(form(title = "Skipped").copy(parentId = id))
|
|
||||||
val daily = source.insertTask(form(title = "Daily part").copy(parentId = id))
|
|
||||||
makeRecurring(daily, at, rule = "FREQ=DAILY")
|
|
||||||
source.setCompleted(done, completed = true)
|
|
||||||
source.setCompleted(nested, completed = true)
|
|
||||||
source.setCancelled(cancelled, cancelled = true)
|
|
||||||
source.setCompletedInstance(daily, at, completed = true)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 7.days)
|
|
||||||
assertThat(db.tasks().entity(done)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(db.tasks().entity(done)!!.completedAt).isNull()
|
|
||||||
assertThat(db.tasks().entity(nested)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(db.tasks().entity(cancelled)!!.status).isEqualTo(TaskStatus.CANCELLED)
|
|
||||||
// A recurring subtask has its own series, and its closed occurrence stays closed.
|
|
||||||
assertThat(db.tasks().overrides(daily).single().status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aHalfDoneSubtaskStartsOverToo() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Routine"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val step = source.insertTask(form(title = "Step", percentComplete = 40).copy(parentId = id))
|
|
||||||
db.tasks().update(db.tasks().entity(step)!!.copy(status = TaskStatus.IN_PROCESS, percentComplete = 40))
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(step)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(db.tasks().entity(step)!!.percentComplete).isNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun movingARoutineBackRestoresTheSubtasksItReset() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Routine"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val done = source.insertTask(form(title = "Step").copy(parentId = id))
|
|
||||||
val touched = source.insertTask(form(title = "Touched since").copy(parentId = id))
|
|
||||||
source.setCompleted(done, completed = true)
|
|
||||||
source.setCompleted(touched, completed = true)
|
|
||||||
val completedAt = db.tasks().entity(done)!!.completedAt
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
db.tasks().update(db.tasks().entity(touched)!!.copy(percentComplete = 30))
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
assertThat(db.tasks().entity(done)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
assertThat(db.tasks().entity(done)!!.completedAt).isEqualTo(completedAt)
|
|
||||||
// Changed after the reset: the user's state wins.
|
|
||||||
assertThat(db.tasks().entity(touched)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(db.tasks().entity(touched)!!.percentComplete).isEqualTo(30)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aDatedSubtaskMovesWithItsRoutineAndBack() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Routine"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val step = source.insertTask(form(title = "Step", due = at + 1.days).copy(parentId = id))
|
|
||||||
val undated = source.insertTask(form(title = "Undated").copy(parentId = id))
|
|
||||||
source.setCompleted(step, completed = true)
|
|
||||||
val due = db.tasks().entity(step)!!.due!!
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
// A week of wall-clock time: an hour either way across a DST change.
|
|
||||||
assertThat(db.tasks().entity(step)!!.due!! - due).isIn(com.google.common.collect.Range.closed(7.days - 1.hours, 7.days + 1.hours))
|
|
||||||
assertThat(db.tasks().entity(step)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(db.tasks().entity(undated)!!.due).isNull()
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(step)!!.due).isEqualTo(due)
|
|
||||||
assertThat(db.tasks().entity(step)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aMarkedCopyUnderARoutineIsLeftAlone() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Routine"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val routineUid = db.tasks().entity(id)!!.uid
|
|
||||||
val copy = source.insertTask(form(title = "Daily part").copy(parentId = id))
|
|
||||||
val elsewhere = source.insertTask(form(title = "Moved here").copy(parentId = id))
|
|
||||||
source.setCompleted(copy, completed = true)
|
|
||||||
source.setCompleted(elsewhere, completed = true)
|
|
||||||
db.tasks().update(db.tasks().entity(copy)!!.copy(unknownProperties = "X-AGENDULA-TICK-COPY:$routineUid"))
|
|
||||||
db.tasks().update(db.tasks().entity(elsewhere)!!.copy(unknownProperties = "X-AGENDULA-TICK-COPY:another-parent"))
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(copy)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
// Its marker names a parent it no longer sits under: an ordinary sub-task here.
|
|
||||||
assertThat(db.tasks().entity(elsewhere)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aSubtaskInAnotherListStartsOverAndComesBack() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Routine"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val otherList = source.createLocalList("Errands", 0)
|
|
||||||
val step = source.insertTask(form(title = "Elsewhere", due = at + 1.days).copy(listId = otherList, parentId = id))
|
|
||||||
source.setCompleted(step, completed = true)
|
|
||||||
val due = db.tasks().entity(step)!!.due
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(step)!!.listId).isEqualTo(otherList)
|
|
||||||
assertThat(db.tasks().entity(step)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(db.tasks().entity(step)!!.due).isNotEqualTo(due)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(step)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
assertThat(db.tasks().entity(step)!!.due).isEqualTo(due)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aSubtaskCompletedBeforeTheClosedCycleIsLeftAlone() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Routine"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val old = source.insertTask(form(title = "Old copy", due = at - 30.days).copy(parentId = id))
|
|
||||||
source.setCompleted(old, completed = true)
|
|
||||||
db.tasks().update(db.tasks().entity(old)!!.copy(completedAt = at - 30.days))
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(old)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
assertThat(db.tasks().entity(old)!!.due).isEqualTo(at - 30.days)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aRestoredSubtaskTickedSinceKeepsItsStateAndGetsItsDateBack() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Routine"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val step = source.insertTask(form(title = "Step", due = at + 1.days).copy(parentId = id))
|
|
||||||
source.setCompleted(step, completed = true)
|
|
||||||
val due = db.tasks().entity(step)!!.due
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
source.setCompleted(step, completed = true)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(step)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
assertThat(db.tasks().entity(step)!!.due).isEqualTo(due)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aRoutineTickedOnItsLastOccurrenceLeavesItsSubtasksDone() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Once more"))
|
|
||||||
makeRecurring(id, at, rule = "FREQ=WEEKLY;COUNT=1")
|
|
||||||
val step = source.insertTask(form(title = "Step").copy(parentId = id))
|
|
||||||
source.setCompleted(step, completed = true)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
assertThat(db.tasks().entity(step)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aSeriesReshapedSinceIsNotMovedBack() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Ten"))
|
|
||||||
makeRecurring(id, at, rule = "FREQ=WEEKLY;COUNT=10")
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
db.tasks().update(db.tasks().entity(id)!!.copy(rrule = "FREQ=DAILY;COUNT=5"))
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 7.days)
|
|
||||||
assertThat(db.tasks().entity(id)!!.rrule).isEqualTo("FREQ=DAILY;COUNT=5")
|
|
||||||
assertThat(db.tasks().allIn(listId).single { it.id != id }.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun tickingTheSameOccurrenceAgainKeepsOneRecord() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.advancedOccurrences().forMaster(id)).hasSize(1)
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun anEditedCopyStillStandsForItsOccurrence() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
val copy = db.tasks().allIn(listId).single { it.id != id }
|
|
||||||
|
|
||||||
db.tasks().update(copy.copy(title = "Watered"))
|
|
||||||
|
|
||||||
assertThat(source.task(id, at)!!.taskId).isEqualTo(copy.id)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aDetachedOccurrenceWithALifeOfItsOwnStaysOut() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
val earlier = db.tasks().insert(master.copy(id = 0, masterId = id, recurrenceId = at, rrule = null, status = TaskStatus.COMPLETED))
|
|
||||||
source.setCompletedInstance(id, at + 7.days, completed = true)
|
|
||||||
source.insertTask(form(title = "Follow-up").copy(parentId = earlier))
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at + 7.days, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(earlier)!!.masterId).isNull()
|
|
||||||
assertThat(source.tasks(TaskQuery(listId = listId)).map { it.occurrenceStart?.epochSeconds })
|
|
||||||
.doesNotContain(at.epochSeconds)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun reopeningAnotherOverrideOfAFinishedSeriesLeavesItsLastOccurrenceClosed() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Three"))
|
|
||||||
makeRecurring(id, at, rule = "FREQ=WEEKLY;COUNT=3")
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
val last = db.tasks().insert(master.copy(id = 0, masterId = id, recurrenceId = at + 14.days, rrule = null, status = TaskStatus.COMPLETED))
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
source.setCompletedInstance(id, at + 7.days, completed = true)
|
|
||||||
assertThat(db.tasks().entity(id)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
|
|
||||||
source.setCompletedInstance(last, at + 14.days, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(last)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(db.tasks().entity(id)!!.status).isEqualTo(TaskStatus.COMPLETED)
|
|
||||||
assertThat(source.task(id, at + 7.days)!!.isClosed).isTrue()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun reopeningTheCopyWithNewRemindersKeepsThem() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
val copy = db.tasks().allIn(listId).single { it.id != id }
|
|
||||||
|
|
||||||
source.updateTask(
|
|
||||||
copy.id,
|
|
||||||
TaskForm(title = copy.title.orEmpty(), listId = listId, start = copy.dtstart, due = copy.due, percentComplete = 0),
|
|
||||||
reminders = listOf(TaskReminder(minutesBefore = 30)),
|
|
||||||
)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at + 7.days)
|
|
||||||
assertThat(db.tasks().entity(copy.id)!!.status).isEqualTo(TaskStatus.NEEDS_ACTION)
|
|
||||||
assertThat(db.alarms().forTask(copy.id)).hasSize(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aDetachedOccurrenceReopenedSinceStaysOut() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
val master = db.tasks().entity(id)!!
|
|
||||||
val earlier = db.tasks().insert(master.copy(id = 0, masterId = id, recurrenceId = at, rrule = null, status = TaskStatus.COMPLETED))
|
|
||||||
source.setCompletedInstance(id, at + 7.days, completed = true)
|
|
||||||
source.setCompleted(earlier, completed = false)
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at + 7.days, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
assertThat(db.tasks().entity(earlier)!!.masterId).isNull()
|
|
||||||
assertThat(source.tasks(TaskQuery(listId = listId)).filter { it.taskId == id }.map { it.occurrenceStart?.epochSeconds })
|
|
||||||
.doesNotContain(at.epochSeconds)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun anOccurrenceWhoseCopyIsGoneReadsAsNothing() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
source.deleteTask(db.tasks().allIn(listId).single { it.id != id }.id)
|
|
||||||
|
|
||||||
assertThat(source.task(id, at)).isNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun catchingUpOnAnOverdueSeriesKeepsEachTickUndoable() {
|
|
||||||
val at = now - 56.days
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
val first = db.tasks().allIn(listId).single { it.id != id }
|
|
||||||
source.setCompletedInstance(id, at + 7.days, completed = true)
|
|
||||||
|
|
||||||
assertThat(db.advancedOccurrences().forCopy(first.id)).isNotNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aRuleTheServerReorderedStillMovesBack() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Ten"))
|
|
||||||
makeRecurring(id, at, rule = "FREQ=WEEKLY;COUNT=10")
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
db.tasks().update(db.tasks().entity(id)!!.copy(rrule = "count=9;FREQ=WEEKLY"))
|
|
||||||
|
|
||||||
source.setCompletedInstance(id, at, completed = false)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun reopeningWithProgressKeepsIt() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
val copy = db.tasks().allIn(listId).single { it.id != id }
|
|
||||||
|
|
||||||
source.updateTask(
|
|
||||||
copy.id,
|
|
||||||
TaskForm(title = copy.title.orEmpty(), listId = listId, start = copy.dtstart, due = copy.due, percentComplete = 40),
|
|
||||||
reminders = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
assertThat(db.tasks().override(id, at)!!.percentComplete).isEqualTo(40)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun theEditorsTidyingDoesNotCountAsAnEdit() {
|
|
||||||
val at = now
|
|
||||||
val id = source.insertTask(form(title = "Weekly"))
|
|
||||||
makeRecurring(id, at)
|
|
||||||
db.tasks().update(db.tasks().entity(id)!!.copy(description = "From the server\n"))
|
|
||||||
source.setCompletedInstance(id, at, completed = true)
|
|
||||||
val copy = db.tasks().allIn(listId).single { it.id != id }
|
|
||||||
|
|
||||||
source.updateTask(
|
|
||||||
copy.id,
|
|
||||||
TaskForm(title = copy.title.orEmpty(), listId = listId, description = copy.description, start = copy.dtstart, due = copy.due, percentComplete = 0),
|
|
||||||
reminders = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(id)!!.dtstart).isEqualTo(at)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun completingANonRecurringTaskThroughTheInstancePathWritesTheRowItself() {
|
fun completingANonRecurringTaskThroughTheInstancePathWritesTheRowItself() {
|
||||||
val id = source.insertTask(form(title = "Buy milk", due = now + 1.days))
|
val id = source.insertTask(form(title = "Buy milk", due = now + 1.days))
|
||||||
@@ -1450,12 +657,10 @@ class RoomTasksDataSourceTest {
|
|||||||
val outOfWindow = db.tasks().insert(
|
val outOfWindow = db.tasks().insert(
|
||||||
TaskEntity(listId = listId, uid = "old", title = "old", dtstart = longAgo, rrule = "FREQ=DAILY;COUNT=2", parentId = parent),
|
TaskEntity(listId = listId, uid = "old", title = "old", dtstart = longAgo, rrule = "FREQ=DAILY;COUNT=2", parentId = parent),
|
||||||
)
|
)
|
||||||
val at = now
|
|
||||||
val series = db.tasks().insert(
|
val series = db.tasks().insert(
|
||||||
TaskEntity(listId = listId, uid = "s", title = "s", dtstart = at, rrule = "FREQ=DAILY;COUNT=3", parentId = parent),
|
TaskEntity(listId = listId, uid = "s", title = "s", dtstart = now, rrule = "FREQ=DAILY;COUNT=3", parentId = parent),
|
||||||
)
|
)
|
||||||
// Not the first occurrence, so it forks an override rather than a copy.
|
source.setCompletedInstance(series, now, true)
|
||||||
source.setCompletedInstance(series, at + 1.days, true)
|
|
||||||
val plain = source.insertTask(form("plain").copy(parentId = parent))
|
val plain = source.insertTask(form("plain").copy(parentId = parent))
|
||||||
|
|
||||||
assertThat(source.subtaskIds(parent)).containsExactly(outOfWindow, series, plain)
|
assertThat(source.subtaskIds(parent)).containsExactly(outOfWindow, series, plain)
|
||||||
|
|||||||
-31
@@ -162,37 +162,6 @@ class TasksDatabaseMigrationTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
fun addsTheAdvancedOccurrencesTable() {
|
|
||||||
helper.createDatabase(TEST_DB, 4).close()
|
|
||||||
|
|
||||||
helper.runMigrationsAndValidate(TEST_DB, 5, true, TasksDatabase.MIGRATION_4_5).use { db ->
|
|
||||||
db.query("SELECT COUNT(*) FROM advanced_occurrences").use { c ->
|
|
||||||
assertThat(c.moveToFirst()).isTrue()
|
|
||||||
assertThat(c.getInt(0)).isEqualTo(0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun addsAnEmptyResetSubtasksRecord() {
|
|
||||||
helper.createDatabase(TEST_DB, 5).use { db ->
|
|
||||||
db.execSQL("INSERT INTO task_lists (id, name, color) VALUES (1, 'Personal', 0)")
|
|
||||||
db.execSQL("INSERT INTO tasks (id, list_id, uid) VALUES (1, 1, 'a'), (2, 1, 'b')")
|
|
||||||
db.execSQL(
|
|
||||||
"INSERT INTO advanced_occurrences (copy_id, master_id, anchor, advanced_to, prior_status, spent, from_override) " +
|
|
||||||
"VALUES (2, 1, 0, 1, 0, 1, 0)",
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
helper.runMigrationsAndValidate(TEST_DB, 6, true, TasksDatabase.MIGRATION_5_6).use { db ->
|
|
||||||
db.query("SELECT reset_subtasks FROM advanced_occurrences").use { c ->
|
|
||||||
assertThat(c.moveToFirst()).isTrue()
|
|
||||||
assertThat(c.getString(0)).isEmpty()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private companion object {
|
private companion object {
|
||||||
const val TEST_DB = "migration-test.db"
|
const val TEST_DB = "migration-test.db"
|
||||||
}
|
}
|
||||||
|
|||||||
-90
@@ -1,90 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.sync
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import androidx.room.Room
|
|
||||||
import androidx.test.core.app.ApplicationProvider
|
|
||||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
|
||||||
import com.google.common.truth.Truth.assertThat
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.room.RoomTasksDataSource
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.room.TaskEntity
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.room.TaskListEntity
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.room.TasksDatabase
|
|
||||||
import org.junit.After
|
|
||||||
import org.junit.Test
|
|
||||||
import org.junit.runner.RunWith
|
|
||||||
import kotlin.time.Clock
|
|
||||||
import kotlin.time.Duration.Companion.seconds
|
|
||||||
import kotlin.time.Instant
|
|
||||||
|
|
||||||
/** A server version replacing a moved series takes the moves' copies with it (#137). */
|
|
||||||
@RunWith(AndroidJUnit4::class)
|
|
||||||
class RoomSyncStoreAdvancesTest {
|
|
||||||
|
|
||||||
private val db = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext<Context>(), TasksDatabase::class.java)
|
|
||||||
.allowMainThreadQueries().build()
|
|
||||||
|
|
||||||
@After
|
|
||||||
fun tearDown() = db.close()
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun droppingAdvancesDeletesTheirCopies() {
|
|
||||||
val list = db.taskLists().insert(TaskListEntity(name = "Home", color = 0))
|
|
||||||
val at = Instant.fromEpochSeconds(Clock.System.now().epochSeconds)
|
|
||||||
val series = db.tasks().insert(TaskEntity(listId = list, uid = "s", title = "Weekly", dtstart = at, rrule = "FREQ=WEEKLY"))
|
|
||||||
RoomTasksDataSource(db).setCompletedInstance(series, at, true)
|
|
||||||
val copy = db.tasks().allIn(list).single { it.id != series }
|
|
||||||
db.tasks().update(copy.copy(href = "copy.ics"))
|
|
||||||
|
|
||||||
RoomSyncStore(db).dropAdvances(series)
|
|
||||||
|
|
||||||
assertThat(db.advancedOccurrences().forMaster(series)).isEmpty()
|
|
||||||
assertThat(db.tasks().entity(copy.id)!!.isDeleted).isTrue()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun movesTheServerAlreadyHasStay() {
|
|
||||||
val list = db.taskLists().insert(TaskListEntity(name = "Home", color = 0))
|
|
||||||
val at = Instant.fromEpochSeconds(Clock.System.now().epochSeconds)
|
|
||||||
val series = db.tasks().insert(TaskEntity(listId = list, uid = "s", title = "Weekly", dtstart = at, rrule = "FREQ=WEEKLY"))
|
|
||||||
RoomTasksDataSource(db).setCompletedInstance(series, at, true)
|
|
||||||
val copy = db.tasks().allIn(list).single { it.id != series }
|
|
||||||
val store = RoomSyncStore(db)
|
|
||||||
store.markSynced(listOf(db.tasks().entity(series)!!), "s.ics", "1")
|
|
||||||
|
|
||||||
store.dropAdvances(series)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(copy.id)!!.isDeleted).isFalse()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aCopyGivenASubtaskSurvivesTheServerWinning() {
|
|
||||||
val list = db.taskLists().insert(TaskListEntity(name = "Home", color = 0))
|
|
||||||
val at = Instant.fromEpochSeconds(Clock.System.now().epochSeconds)
|
|
||||||
val series = db.tasks().insert(TaskEntity(listId = list, uid = "s", title = "Weekly", dtstart = at, rrule = "FREQ=WEEKLY"))
|
|
||||||
RoomTasksDataSource(db).setCompletedInstance(series, at, true)
|
|
||||||
val copy = db.tasks().allIn(list).single { it.id != series }
|
|
||||||
db.tasks().insert(TaskEntity(listId = list, uid = "p", title = "Part", parentId = copy.id))
|
|
||||||
|
|
||||||
RoomSyncStore(db).dropAdvances(series)
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(copy.id)).isNotNull()
|
|
||||||
assertThat(db.tasks().entity(copy.id)!!.isDeleted).isFalse()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun aTickDuringTheUploadIsNotSettled() {
|
|
||||||
val list = db.taskLists().insert(TaskListEntity(name = "Home", color = 0))
|
|
||||||
val at = Instant.fromEpochSeconds(Clock.System.now().epochSeconds)
|
|
||||||
val series = db.tasks().insert(
|
|
||||||
TaskEntity(listId = list, uid = "s", title = "Weekly", dtstart = at, rrule = "FREQ=WEEKLY", lastModified = at - 1.seconds),
|
|
||||||
)
|
|
||||||
val uploaded = db.tasks().entity(series)!!
|
|
||||||
RoomTasksDataSource(db).setCompletedInstance(series, at, true)
|
|
||||||
val store = RoomSyncStore(db)
|
|
||||||
|
|
||||||
store.markSynced(listOf(uploaded), "s.ics", "1")
|
|
||||||
|
|
||||||
assertThat(db.tasks().entity(series)!!.isDirty).isTrue()
|
|
||||||
assertThat(db.advancedOccurrences().forMaster(series).single().settled).isFalse()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -17,7 +17,6 @@ import kotlinx.coroutines.flow.first
|
|||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import okhttp3.HttpUrl
|
import okhttp3.HttpUrl
|
||||||
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
||||||
import java.io.IOException
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
import javax.inject.Singleton
|
import javax.inject.Singleton
|
||||||
|
|
||||||
@@ -194,15 +193,7 @@ class AccountRepository @Inject constructor(
|
|||||||
inserted += attach(id, selected)
|
inserted += attach(id, selected)
|
||||||
id
|
id
|
||||||
}
|
}
|
||||||
// Inside the rollback's reach: a DataStore failure here would otherwise
|
serverTrust.put(accountId, trust)
|
||||||
// leave the row with no credential, the hazard the comment above names.
|
|
||||||
if (!saveTrust(accountId, trust)) {
|
|
||||||
rollback(accountId, inserted)
|
|
||||||
return@withContext Outcome.CredentialFailed(
|
|
||||||
Outcome.Cause.NOT_SAVED,
|
|
||||||
"the server trust could not be stored",
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!credentials.put(accountId, appPassword)) {
|
if (!credentials.put(accountId, appPassword)) {
|
||||||
// Never leave a half-made account behind: without a credential it
|
// Never leave a half-made account behind: without a credential it
|
||||||
@@ -332,8 +323,7 @@ class AccountRepository @Inject constructor(
|
|||||||
-> Collections.NeedsSignIn
|
-> Collections.NeedsSignIn
|
||||||
is CalDavDiscovery.Outcome.NotCalDav -> Collections.Failed(outcome.cause)
|
is CalDavDiscovery.Outcome.NotCalDav -> Collections.Failed(outcome.cause)
|
||||||
is CalDavDiscovery.Outcome.Failed -> Collections.Failed(outcome.cause)
|
is CalDavDiscovery.Outcome.Failed -> Collections.Failed(outcome.cause)
|
||||||
// A certificate that changed since it was trusted. The account offers
|
// A certificate that changed since it was trusted; signing in again re-asks.
|
||||||
// "Sign in again" for a certificate failure, and that flow re-asks.
|
|
||||||
is CalDavDiscovery.Outcome.UntrustedCertificate ->
|
is CalDavDiscovery.Outcome.UntrustedCertificate ->
|
||||||
Collections.Failed(CalDavDiscovery.Outcome.Cause.TLS)
|
Collections.Failed(CalDavDiscovery.Outcome.Cause.TLS)
|
||||||
}
|
}
|
||||||
@@ -425,11 +415,6 @@ class AccountRepository @Inject constructor(
|
|||||||
"the device keystore would not store the password",
|
"the device keystore would not store the password",
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
// Before anything else changes, so a failure leaves the account stopped
|
|
||||||
// and the sign-in retryable rather than signed in with the old trust.
|
|
||||||
if (!withContext(NonCancellable) { saveTrust(accountId, trust) }) {
|
|
||||||
return Outcome.CredentialFailed(Outcome.Cause.NOT_SAVED, "the server trust could not be stored")
|
|
||||||
}
|
|
||||||
withContext(NonCancellable) {
|
withContext(NonCancellable) {
|
||||||
database.runInTransaction {
|
database.runInTransaction {
|
||||||
database.accounts().update(
|
database.accounts().update(
|
||||||
@@ -444,6 +429,7 @@ class AccountRepository @Inject constructor(
|
|||||||
)
|
)
|
||||||
attach(accountId, selected)
|
attach(accountId, selected)
|
||||||
}
|
}
|
||||||
|
serverTrust.put(accountId, trust)
|
||||||
// ⚠️ Ticked lists are attached; unticked ones are left alone. The
|
// ⚠️ Ticked lists are attached; unticked ones are left alone. The
|
||||||
// picker pre-ticks everything *writable*, not everything already
|
// picker pre-ticks everything *writable*, not everything already
|
||||||
// attached, so detaching what is unticked would silently stop
|
// attached, so detaching what is unticked would silently stop
|
||||||
@@ -478,16 +464,7 @@ class AccountRepository @Inject constructor(
|
|||||||
inserted.forEach { database.taskLists().delete(it) }
|
inserted.forEach { database.taskLists().delete(it) }
|
||||||
database.accounts().delete(accountId)
|
database.accounts().delete(accountId)
|
||||||
}
|
}
|
||||||
// Ids are never reused, and a later create overwrites the keys anyway.
|
serverTrust.forget(accountId)
|
||||||
runCatching { serverTrust.forget(accountId) }
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun saveTrust(accountId: Long, trust: ServerTrust): Boolean =
|
|
||||||
try {
|
|
||||||
serverTrust.put(accountId, trust)
|
|
||||||
true
|
|
||||||
} catch (_: IOException) {
|
|
||||||
false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -417,14 +417,8 @@ class CollectionSyncer(
|
|||||||
return@forEach
|
return@forEach
|
||||||
}
|
}
|
||||||
|
|
||||||
if (href == null) {
|
|
||||||
val body = serialize(local) ?: return@forEach
|
val body = serialize(local) ?: return@forEach
|
||||||
createResource(local, body)
|
if (href == null) createResource(local, body) else updateResource(local, href, body)
|
||||||
} else {
|
|
||||||
val revised = local.revised()
|
|
||||||
val body = serialize(revised) ?: return@forEach
|
|
||||||
updateResource(revised, href, body)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -615,7 +609,7 @@ class CollectionSyncer(
|
|||||||
// via `master_id`.
|
// via `master_id`.
|
||||||
val (buried, kept) = local.rows.partition { it.isDeleted && it.recurrenceId != null }
|
val (buried, kept) = local.rows.partition { it.isDeleted && it.recurrenceId != null }
|
||||||
if (buried.isNotEmpty()) store.deleteAll(buried.map { it.id })
|
if (buried.isNotEmpty()) store.deleteAll(buried.map { it.id })
|
||||||
store.markSynced(kept, key, eTag)
|
store.markSynced(kept.map { it.id }, key, eTag)
|
||||||
// Both, because a resource that failed as a create was counted under
|
// Both, because a resource that failed as a create was counted under
|
||||||
// its UID and is now counted under its href. Clearing one would leak
|
// its UID and is now counted under its href. Clearing one would leak
|
||||||
// the other into the store forever.
|
// the other into the store forever.
|
||||||
@@ -831,7 +825,6 @@ class CollectionSyncer(
|
|||||||
}
|
}
|
||||||
|
|
||||||
pendingDiscard.remove(href)?.let { cause ->
|
pendingDiscard.remove(href)?.let { cause ->
|
||||||
store.dropAdvances(masterId)
|
|
||||||
report = report.copy(
|
report = report.copy(
|
||||||
discardedEdits = report.discardedEdits +
|
discardedEdits = report.discardedEdits +
|
||||||
DiscardedEdit(uid, losing?.title, cause),
|
DiscardedEdit(uid, losing?.title, cause),
|
||||||
@@ -1087,16 +1080,6 @@ class CollectionSyncer(
|
|||||||
|
|
||||||
/** What gets serialised: a deleted override is simply absent. */
|
/** What gets serialised: a deleted override is simply absent. */
|
||||||
val live: List<TaskEntity> = rows.filterNot { it.isDeleted }
|
val live: List<TaskEntity> = rows.filterNot { it.isDeleted }
|
||||||
|
|
||||||
/**
|
|
||||||
* With `SEQUENCE` raised on each changed row. Apple's clients keep their
|
|
||||||
* cached copy of a task whose `SEQUENCE` did not move (#137).
|
|
||||||
*/
|
|
||||||
fun revised(): LocalResource = copy(
|
|
||||||
rows = rows.map { row ->
|
|
||||||
if (row.isDirty && !row.isDeleted && VTodoMapper.revisesSequence(row)) row.copy(sequence = row.sequence + 1) else row
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private companion object {
|
private companion object {
|
||||||
|
|||||||
@@ -2,9 +2,11 @@ package de.jeanlucmakiola.agendula.data.sync
|
|||||||
|
|
||||||
import androidx.datastore.core.DataStore
|
import androidx.datastore.core.DataStore
|
||||||
import androidx.datastore.preferences.core.Preferences
|
import androidx.datastore.preferences.core.Preferences
|
||||||
|
import androidx.datastore.preferences.core.booleanPreferencesKey
|
||||||
import androidx.datastore.preferences.core.edit
|
import androidx.datastore.preferences.core.edit
|
||||||
import androidx.datastore.preferences.core.longPreferencesKey
|
import androidx.datastore.preferences.core.longPreferencesKey
|
||||||
import androidx.datastore.preferences.core.stringPreferencesKey
|
import androidx.datastore.preferences.core.stringPreferencesKey
|
||||||
|
import androidx.datastore.preferences.core.stringSetPreferencesKey
|
||||||
import de.jeanlucmakiola.agendula.data.di.SyncStateDataStore
|
import de.jeanlucmakiola.agendula.data.di.SyncStateDataStore
|
||||||
import de.jeanlucmakiola.caldav.NextcloudLoginFlow
|
import de.jeanlucmakiola.caldav.NextcloudLoginFlow
|
||||||
import de.jeanlucmakiola.caldav.ServerTrust
|
import de.jeanlucmakiola.caldav.ServerTrust
|
||||||
@@ -65,7 +67,8 @@ class PendingLoginFlowStore @Inject constructor(
|
|||||||
prefs[POLL_ENDPOINT] = flow.pollEndpoint.toString()
|
prefs[POLL_ENDPOINT] = flow.pollEndpoint.toString()
|
||||||
prefs[POLL_TOKEN] = flow.pollToken
|
prefs[POLL_TOKEN] = flow.pollToken
|
||||||
prefs[DEADLINE] = flow.deadlineEpochSeconds
|
prefs[DEADLINE] = flow.deadlineEpochSeconds
|
||||||
TRUST.write(prefs, trust)
|
prefs[TRUSTED_CERTIFICATES] = trust.pinnedCertificates
|
||||||
|
prefs[CLEARTEXT] = trust.allowCleartext
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,7 +79,8 @@ class PendingLoginFlowStore @Inject constructor(
|
|||||||
prefs.remove(POLL_ENDPOINT)
|
prefs.remove(POLL_ENDPOINT)
|
||||||
prefs.remove(POLL_TOKEN)
|
prefs.remove(POLL_TOKEN)
|
||||||
prefs.remove(DEADLINE)
|
prefs.remove(DEADLINE)
|
||||||
TRUST.remove(prefs)
|
prefs.remove(TRUSTED_CERTIFICATES)
|
||||||
|
prefs.remove(CLEARTEXT)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -141,13 +145,20 @@ class PendingLoginFlowStore @Inject constructor(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun trust(): ServerTrust = TRUST.read(dataStore.data.first())
|
private suspend fun trust(): ServerTrust {
|
||||||
|
val prefs = dataStore.data.first()
|
||||||
|
return ServerTrust(
|
||||||
|
pinnedCertificates = prefs[TRUSTED_CERTIFICATES].orEmpty(),
|
||||||
|
allowCleartext = prefs[CLEARTEXT] ?: false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
private companion object {
|
private companion object {
|
||||||
val LOGIN_URL = stringPreferencesKey("login_flow_url")
|
val LOGIN_URL = stringPreferencesKey("login_flow_url")
|
||||||
val POLL_ENDPOINT = stringPreferencesKey("login_flow_poll_endpoint")
|
val POLL_ENDPOINT = stringPreferencesKey("login_flow_poll_endpoint")
|
||||||
val POLL_TOKEN = stringPreferencesKey("login_flow_poll_token")
|
val POLL_TOKEN = stringPreferencesKey("login_flow_poll_token")
|
||||||
val DEADLINE = longPreferencesKey("login_flow_deadline")
|
val DEADLINE = longPreferencesKey("login_flow_deadline")
|
||||||
val TRUST = ServerTrustKeys("login_flow_trusted_certificates", "login_flow_cleartext")
|
val TRUSTED_CERTIFICATES = stringSetPreferencesKey("login_flow_trusted_certificates")
|
||||||
|
val CLEARTEXT = booleanPreferencesKey("login_flow_cleartext")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.sync
|
|
||||||
|
|
||||||
import androidx.datastore.preferences.core.MutablePreferences
|
|
||||||
import androidx.datastore.preferences.core.Preferences
|
|
||||||
import androidx.datastore.preferences.core.booleanPreferencesKey
|
|
||||||
import androidx.datastore.preferences.core.stringSetPreferencesKey
|
|
||||||
import androidx.lifecycle.SavedStateHandle
|
|
||||||
import de.jeanlucmakiola.caldav.ServerTrust
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The one mapping between a [ServerTrust] and the key-value stores it is kept
|
|
||||||
* in, so a field added to it cannot be dropped by one of them.
|
|
||||||
*/
|
|
||||||
class ServerTrustKeys(private val certificatesName: String, private val cleartextName: String) {
|
|
||||||
|
|
||||||
private val certificates = stringSetPreferencesKey(certificatesName)
|
|
||||||
private val cleartext = booleanPreferencesKey(cleartextName)
|
|
||||||
|
|
||||||
fun read(prefs: Preferences) = ServerTrust(
|
|
||||||
pinnedCertificates = prefs[certificates].orEmpty(),
|
|
||||||
allowCleartext = prefs[cleartext] ?: false,
|
|
||||||
)
|
|
||||||
|
|
||||||
fun write(prefs: MutablePreferences, trust: ServerTrust) {
|
|
||||||
if (trust.pinnedCertificates.isEmpty()) {
|
|
||||||
prefs.remove(certificates)
|
|
||||||
} else {
|
|
||||||
prefs[certificates] = trust.pinnedCertificates
|
|
||||||
}
|
|
||||||
if (trust.allowCleartext) prefs[cleartext] = true else prefs.remove(cleartext)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun remove(prefs: MutablePreferences) = write(prefs, ServerTrust.DEFAULT)
|
|
||||||
|
|
||||||
fun read(handle: SavedStateHandle) = ServerTrust(
|
|
||||||
pinnedCertificates = handle.get<ArrayList<String>>(certificatesName).orEmpty().toSet(),
|
|
||||||
allowCleartext = handle[cleartextName] ?: false,
|
|
||||||
)
|
|
||||||
|
|
||||||
fun write(handle: SavedStateHandle, trust: ServerTrust) {
|
|
||||||
handle[certificatesName] = ArrayList(trust.pinnedCertificates)
|
|
||||||
handle[cleartextName] = trust.allowCleartext
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,9 @@ package de.jeanlucmakiola.agendula.data.sync
|
|||||||
|
|
||||||
import androidx.datastore.core.DataStore
|
import androidx.datastore.core.DataStore
|
||||||
import androidx.datastore.preferences.core.Preferences
|
import androidx.datastore.preferences.core.Preferences
|
||||||
|
import androidx.datastore.preferences.core.booleanPreferencesKey
|
||||||
import androidx.datastore.preferences.core.edit
|
import androidx.datastore.preferences.core.edit
|
||||||
|
import androidx.datastore.preferences.core.stringSetPreferencesKey
|
||||||
import de.jeanlucmakiola.agendula.data.di.SyncStateDataStore
|
import de.jeanlucmakiola.agendula.data.di.SyncStateDataStore
|
||||||
import de.jeanlucmakiola.caldav.ServerTrust
|
import de.jeanlucmakiola.caldav.ServerTrust
|
||||||
import kotlinx.coroutines.flow.Flow
|
import kotlinx.coroutines.flow.Flow
|
||||||
@@ -24,15 +26,29 @@ class ServerTrustStore @Inject constructor(
|
|||||||
dataStore.data.map { read(it, accountId) }.distinctUntilChanged()
|
dataStore.data.map { read(it, accountId) }.distinctUntilChanged()
|
||||||
|
|
||||||
suspend fun put(accountId: Long, trust: ServerTrust) {
|
suspend fun put(accountId: Long, trust: ServerTrust) {
|
||||||
dataStore.edit { keys(accountId).write(it, trust) }
|
dataStore.edit { prefs ->
|
||||||
|
if (trust.pinnedCertificates.isEmpty()) {
|
||||||
|
prefs.remove(certificates(accountId))
|
||||||
|
} else {
|
||||||
|
prefs[certificates(accountId)] = trust.pinnedCertificates
|
||||||
|
}
|
||||||
|
if (trust.allowCleartext) prefs[cleartext(accountId)] = true else prefs.remove(cleartext(accountId))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun forget(accountId: Long) {
|
suspend fun forget(accountId: Long) {
|
||||||
dataStore.edit { keys(accountId).remove(it) }
|
dataStore.edit { prefs ->
|
||||||
|
prefs.remove(certificates(accountId))
|
||||||
|
prefs.remove(cleartext(accountId))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun read(prefs: Preferences, accountId: Long) = keys(accountId).read(prefs)
|
private fun read(prefs: Preferences, accountId: Long) = ServerTrust(
|
||||||
|
pinnedCertificates = prefs[certificates(accountId)].orEmpty(),
|
||||||
|
allowCleartext = prefs[cleartext(accountId)] ?: false,
|
||||||
|
)
|
||||||
|
|
||||||
private fun keys(accountId: Long) =
|
private fun certificates(accountId: Long) = stringSetPreferencesKey("server_trust_certs_$accountId")
|
||||||
ServerTrustKeys("server_trust_certs_$accountId", "server_trust_cleartext_$accountId")
|
|
||||||
|
private fun cleartext(accountId: Long) = booleanPreferencesKey("server_trust_cleartext_$accountId")
|
||||||
}
|
}
|
||||||
@@ -3,9 +3,6 @@ package de.jeanlucmakiola.agendula.data.sync
|
|||||||
import de.jeanlucmakiola.agendula.data.tasks.room.TaskAlarmEntity
|
import de.jeanlucmakiola.agendula.data.tasks.room.TaskAlarmEntity
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.room.TaskEntity
|
import de.jeanlucmakiola.agendula.data.tasks.room.TaskEntity
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.room.TasksDatabase
|
import de.jeanlucmakiola.agendula.data.tasks.room.TasksDatabase
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.room.recurrenceAnchor
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.wholeSecond
|
|
||||||
import kotlin.time.Duration.Companion.seconds
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -45,21 +42,12 @@ interface SyncStore {
|
|||||||
fun deleteAll(taskIds: List<Long>)
|
fun deleteAll(taskIds: List<Long>)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Forgets how ticking occurrences moved [masterId]'s series, and deletes the
|
* Records href and ETag on a resource's rows, clearing `is_dirty`.
|
||||||
* copies that left: the server's version replaced the moved series, and its
|
|
||||||
* own overrides stand for those occurrences again. A row given a life of its
|
|
||||||
* own since stays.
|
|
||||||
*/
|
|
||||||
fun dropAdvances(masterId: Long) = Unit
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Records href and ETag on a resource's [rows], as they were serialised,
|
|
||||||
* clearing `is_dirty` on those that did not change since.
|
|
||||||
*
|
*
|
||||||
* The caller excludes any row it left out of the body — that row is deleted,
|
* The caller excludes any row it left out of the body — that row is deleted,
|
||||||
* not marked synced.
|
* not marked synced.
|
||||||
*/
|
*/
|
||||||
fun markSynced(rows: List<TaskEntity>, href: String?, eTag: String?)
|
fun markSynced(taskIds: List<Long>, href: String?, eTag: String?)
|
||||||
|
|
||||||
fun setParent(taskId: Long, parentId: Long?)
|
fun setParent(taskId: Long, parentId: Long?)
|
||||||
|
|
||||||
@@ -109,43 +97,8 @@ class RoomSyncStore @Inject constructor(
|
|||||||
if (taskIds.isNotEmpty()) database.tasks().deleteAll(taskIds)
|
if (taskIds.isNotEmpty()) database.tasks().deleteAll(taskIds)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun dropAdvances(masterId: Long) = database.runInTransaction {
|
override fun markSynced(taskIds: List<Long>, href: String?, eTag: String?) {
|
||||||
val advanced = database.advancedOccurrences()
|
if (taskIds.isNotEmpty()) database.tasks().markSynced(taskIds, href, eTag)
|
||||||
val tasks = database.tasks()
|
|
||||||
val master = tasks.entity(masterId)
|
|
||||||
// Only moves the server never saw, on copies that are still just that.
|
|
||||||
advanced.forMaster(masterId).filter { !it.settled && it.undoable }.forEach { record ->
|
|
||||||
// An edited detached row was unlinked already, so only untouched ones are named.
|
|
||||||
val rows = advanced.detachedFor(record.copyId).mapNotNull { it.taskId } + record.copyId
|
|
||||||
advanced.delete(record.copyId)
|
|
||||||
rows.mapNotNull { tasks.entity(it) }
|
|
||||||
.filter { row ->
|
|
||||||
!row.isDeleted && tasks.subtasks(row.id).isEmpty() &&
|
|
||||||
(master == null || row.listId == master.listId && row.parentId == master.parentId)
|
|
||||||
}
|
|
||||||
.forEach { row ->
|
|
||||||
// Never uploaded: nobody to tell. Uploaded: a tombstone the next run deletes.
|
|
||||||
if (row.href == null) tasks.delete(row.id)
|
|
||||||
else tasks.update(row.copy(isDeleted = true, isDirty = true))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun markSynced(rows: List<TaskEntity>, href: String?, eTag: String?) {
|
|
||||||
if (rows.isEmpty()) return
|
|
||||||
database.runInTransaction {
|
|
||||||
database.tasks().markSynced(rows.map { it.id }, href, eTag)
|
|
||||||
rows.forEach { database.tasks().raiseSequence(it.id, it.sequence) }
|
|
||||||
// Changed while the body was on its way, by a tick or an edit: still owed to the server.
|
|
||||||
rows.forEach { database.tasks().dirtyIfChangedSince(it.id, it.lastModified) }
|
|
||||||
// The server now holds each series as far as the body moved it; a tick
|
|
||||||
// since is still the device's own.
|
|
||||||
rows.filter { it.recurrenceId == null }.forEach { row ->
|
|
||||||
val anchor = row.recurrenceAnchor
|
|
||||||
if (anchor == null) database.advancedOccurrences().settle(listOf(row.id))
|
|
||||||
else database.advancedOccurrences().settleUpTo(row.id, wholeSecond(anchor) + 1.seconds)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun setParent(taskId: Long, parentId: Long?) {
|
override fun setParent(taskId: Long, parentId: Long?) {
|
||||||
|
|||||||
@@ -56,8 +56,8 @@ class SyncWorker @AssistedInject constructor(
|
|||||||
// log line is the same as saying nothing. Only what is new: the
|
// log line is the same as saying nothing. Only what is new: the
|
||||||
// store has already dropped whatever the user has been told.
|
// store has already dropped whatever the user has been told.
|
||||||
noticeNotifier.post(accountName, outcome.notices)
|
noticeNotifier.post(accountName, outcome.notices)
|
||||||
// Here rather than left to ReminderRefresher's debounce: once
|
// Nothing else re-arms reminders for what a sync pulled in: in our
|
||||||
// the worker returns, nothing keeps the process alive for it.
|
// own store no provider broadcast fires.
|
||||||
if (outcome.reports.any { it.hadWork || it.discardedEdits.isNotEmpty() }) {
|
if (outcome.reports.any { it.hadWork || it.discardedEdits.isNotEmpty() }) {
|
||||||
runCatching { reminderScheduler.sync() }
|
runCatching { reminderScheduler.sync() }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -169,7 +169,7 @@ internal fun AccountDetailScreen(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (shown.offersSignIn) {
|
if (shown.needsSignIn) {
|
||||||
add { position ->
|
add { position ->
|
||||||
GroupedRow(
|
GroupedRow(
|
||||||
title = stringResource(R.string.accounts_sign_in_again),
|
title = stringResource(R.string.accounts_sign_in_again),
|
||||||
@@ -178,8 +178,7 @@ internal fun AccountDetailScreen(
|
|||||||
onClick = { onSignInAgain(account) },
|
onClick = { onSignInAgain(account) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
if (!shown.needsSignIn) {
|
|
||||||
add { position ->
|
add { position ->
|
||||||
GroupedRow(
|
GroupedRow(
|
||||||
title = stringResource(R.string.accounts_sync_now),
|
title = stringResource(R.string.accounts_sync_now),
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ internal fun AccountsScreen(
|
|||||||
when {
|
when {
|
||||||
row.removing -> CircularProgressIndicator(Modifier.size(20.dp))
|
row.removing -> CircularProgressIndicator(Modifier.size(20.dp))
|
||||||
!usable -> Unit
|
!usable -> Unit
|
||||||
row.offersSignIn -> IconButton(onClick = { onSignInAgain(account) }) {
|
row.needsSignIn -> IconButton(onClick = { onSignInAgain(account) }) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.AutoMirrored.Rounded.Login,
|
Icons.AutoMirrored.Rounded.Login,
|
||||||
contentDescription = stringResource(R.string.accounts_sign_in_again),
|
contentDescription = stringResource(R.string.accounts_sign_in_again),
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import de.jeanlucmakiola.agendula.data.sync.AccountRepository
|
|||||||
import de.jeanlucmakiola.agendula.data.sync.AccountStateStore
|
import de.jeanlucmakiola.agendula.data.sync.AccountStateStore
|
||||||
import de.jeanlucmakiola.agendula.data.sync.ServerTrustStore
|
import de.jeanlucmakiola.agendula.data.sync.ServerTrustStore
|
||||||
import de.jeanlucmakiola.agendula.data.sync.SyncAvailability
|
import de.jeanlucmakiola.agendula.data.sync.SyncAvailability
|
||||||
import de.jeanlucmakiola.agendula.data.sync.SyncFailure
|
|
||||||
import de.jeanlucmakiola.agendula.data.sync.SyncNotice
|
import de.jeanlucmakiola.agendula.data.sync.SyncNotice
|
||||||
import de.jeanlucmakiola.agendula.data.sync.SyncNoticeStore
|
import de.jeanlucmakiola.agendula.data.sync.SyncNoticeStore
|
||||||
import de.jeanlucmakiola.agendula.data.sync.SyncTrigger
|
import de.jeanlucmakiola.agendula.data.sync.SyncTrigger
|
||||||
@@ -192,18 +191,7 @@ class AccountsViewModel @Inject constructor(
|
|||||||
*/
|
*/
|
||||||
val notices: List<SyncNotice> = emptyList(),
|
val notices: List<SyncNotice> = emptyList(),
|
||||||
val lists: ListPush = ListPush.NONE,
|
val lists: ListPush = ListPush.NONE,
|
||||||
) {
|
)
|
||||||
/**
|
|
||||||
* The last sync was refused over the server's certificate — typically a
|
|
||||||
* pinned one that was renewed. Nothing sets [needsSignIn] for that, yet
|
|
||||||
* signing in again is the only route that can trust the new one.
|
|
||||||
*/
|
|
||||||
val certificateRefused: Boolean
|
|
||||||
get() = account.lastSyncError?.let { SyncFailure.of(it).kind == SyncFailure.Kind.CERTIFICATE } == true
|
|
||||||
|
|
||||||
/** Whether "Sign in again" is the way forward for this account. */
|
|
||||||
val offersSignIn: Boolean get() = needsSignIn || certificateRefused
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Accounts whose removal has started and not finished.
|
* Accounts whose removal has started and not finished.
|
||||||
|
|||||||
@@ -440,19 +440,11 @@ private fun ColumnScope.StepActions(state: AddAccountUiState, viewModel: AddAcco
|
|||||||
) { Text(stringResource(R.string.add_account_change_address)) }
|
) { Text(stringResource(R.string.add_account_change_address)) }
|
||||||
}
|
}
|
||||||
|
|
||||||
// The safe answer stays visible, as it does for plain http: back is
|
is AddAccountStep.TrustCertificate -> PrimaryAction(
|
||||||
// not something every user knows to look for on a security prompt.
|
|
||||||
is AddAccountStep.TrustCertificate -> {
|
|
||||||
PrimaryAction(
|
|
||||||
label = stringResource(R.string.add_account_certificate_trust),
|
label = stringResource(R.string.add_account_certificate_trust),
|
||||||
enabled = true,
|
enabled = true,
|
||||||
onClick = viewModel::onCertificateTrusted,
|
onClick = viewModel::onCertificateTrusted,
|
||||||
)
|
)
|
||||||
TextButton(
|
|
||||||
onClick = { viewModel.onBackWithin() },
|
|
||||||
modifier = Modifier.fillMaxWidth(),
|
|
||||||
) { Text(stringResource(R.string.add_account_certificate_decline)) }
|
|
||||||
}
|
|
||||||
|
|
||||||
is AddAccountStep.WaitingForBrowser -> {
|
is AddAccountStep.WaitingForBrowser -> {
|
||||||
// A failed flow is retried by default. With no browser a retry
|
// A failed flow is retried by default. With no browser a retry
|
||||||
|
|||||||
+56
-103
@@ -8,7 +8,6 @@ import de.jeanlucmakiola.agendula.data.sync.AccountCreator
|
|||||||
import de.jeanlucmakiola.agendula.data.sync.AccountRepository
|
import de.jeanlucmakiola.agendula.data.sync.AccountRepository
|
||||||
import de.jeanlucmakiola.agendula.data.sync.CalDavGateway
|
import de.jeanlucmakiola.agendula.data.sync.CalDavGateway
|
||||||
import de.jeanlucmakiola.agendula.data.sync.LoginFlowRecord
|
import de.jeanlucmakiola.agendula.data.sync.LoginFlowRecord
|
||||||
import de.jeanlucmakiola.agendula.data.sync.ServerTrustKeys
|
|
||||||
import de.jeanlucmakiola.caldav.CalDavDiscovery
|
import de.jeanlucmakiola.caldav.CalDavDiscovery
|
||||||
import de.jeanlucmakiola.caldav.CalDavProvider
|
import de.jeanlucmakiola.caldav.CalDavProvider
|
||||||
import de.jeanlucmakiola.caldav.NextcloudLoginFlow
|
import de.jeanlucmakiola.caldav.NextcloudLoginFlow
|
||||||
@@ -18,8 +17,6 @@ import de.jeanlucmakiola.caldav.ServerTrust
|
|||||||
import de.jeanlucmakiola.caldav.ServiceDiscovery
|
import de.jeanlucmakiola.caldav.ServiceDiscovery
|
||||||
import de.jeanlucmakiola.caldav.TaskCollection
|
import de.jeanlucmakiola.caldav.TaskCollection
|
||||||
import de.jeanlucmakiola.agendula.data.di.ApplicationScope
|
import de.jeanlucmakiola.agendula.data.di.ApplicationScope
|
||||||
import kotlinx.coroutines.CancellationException
|
|
||||||
import kotlinx.coroutines.CompletableDeferred
|
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.NonCancellable
|
import kotlinx.coroutines.NonCancellable
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
@@ -340,33 +337,26 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
|
|
||||||
/** What the user agreed to trust in this flow, handed to every gateway call. */
|
/** What the user agreed to trust in this flow, handed to every gateway call. */
|
||||||
private var trust: ServerTrust
|
private var trust: ServerTrust
|
||||||
get() = TRUST_KEYS.read(handle)
|
get() = ServerTrust(
|
||||||
set(value) = TRUST_KEYS.write(handle, value)
|
pinnedCertificates = handle.get<ArrayList<String>>(KEY_TRUSTED_CERTIFICATES).orEmpty().toSet(),
|
||||||
|
allowCleartext = handle[KEY_CLEARTEXT] ?: false,
|
||||||
|
)
|
||||||
|
set(value) {
|
||||||
|
handle[KEY_TRUSTED_CERTIFICATES] = ArrayList(value.pinnedCertificates)
|
||||||
|
handle[KEY_CLEARTEXT] = value.allowCleartext
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/** The address plain http was accepted for; another address asks again. */
|
||||||
* The address [trust] was given for. Pins and plain http both belong to it,
|
private var cleartextAddress: String?
|
||||||
* so submitting any other address starts from nothing.
|
get() = handle[KEY_CLEARTEXT_ADDRESS]
|
||||||
*/
|
set(value) { handle[KEY_CLEARTEXT_ADDRESS] = value }
|
||||||
private var trustAddress: String?
|
|
||||||
get() = handle[KEY_TRUST_ADDRESS]
|
|
||||||
set(value) { handle[KEY_TRUST_ADDRESS] = value }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The pins in [trust] came from the account being signed in to, not from
|
|
||||||
* this flow. The first certificate trusted now replaces them, so a renewed
|
|
||||||
* certificate retires the one it renews instead of joining it.
|
|
||||||
*/
|
|
||||||
private var inheritedPins: Boolean
|
|
||||||
get() = handle[KEY_INHERITED_PINS] ?: false
|
|
||||||
set(value) { handle[KEY_INHERITED_PINS] = value }
|
|
||||||
|
|
||||||
/** Loading a re-authenticated account's stored trust, which discovery waits for. */
|
/** Loading a re-authenticated account's stored trust, which discovery waits for. */
|
||||||
private var trustLoad: Job? = null
|
private var trustLoad: Job? = null
|
||||||
|
|
||||||
/** The open [AddAccountStep.TrustCertificate] question, and where declining it goes. */
|
/** What [AddAccountStep.TrustCertificate] re-runs once trusted, and where Back goes. */
|
||||||
private class TrustPrompt(val answer: CompletableDeferred<Unit>, val back: AddAccountStep)
|
private var trustRetry: (() -> Unit)? = null
|
||||||
|
private var trustDeclined: AddAccountStep? = null
|
||||||
private var trustPrompt: TrustPrompt? = null
|
|
||||||
|
|
||||||
/** Which hosts asked for credentials, for the cross-domain diagnostic. */
|
/** Which hosts asked for credentials, for the cross-domain diagnostic. */
|
||||||
private var hostsNeedingAuth: List<String>
|
private var hostsNeedingAuth: List<String>
|
||||||
@@ -471,8 +461,7 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
trustLoad = viewModelScope.launch {
|
trustLoad = viewModelScope.launch {
|
||||||
val stored = runCatching { repository.trustFor(accountId) }.getOrDefault(ServerTrust.DEFAULT)
|
val stored = runCatching { repository.trustFor(accountId) }.getOrDefault(ServerTrust.DEFAULT)
|
||||||
trust = stored
|
trust = stored
|
||||||
trustAddress = address
|
if (stored.allowCleartext) cleartextAddress = address
|
||||||
inheritedPins = stored.pinnedCertificates.isNotEmpty()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -532,6 +521,9 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
updateState { it.copy(originMismatch = null) }
|
updateState { it.copy(originMismatch = null) }
|
||||||
typedInput = input
|
typedInput = input
|
||||||
addressInput = input
|
addressInput = input
|
||||||
|
trustRetry = null
|
||||||
|
trustDeclined = null
|
||||||
|
if (input != cleartextAddress) trust = trust.copy(allowCleartext = false)
|
||||||
|
|
||||||
val quirk = ServerQuirk.forInput(input)
|
val quirk = ServerQuirk.forInput(input)
|
||||||
if (quirk?.isFatal == true) {
|
if (quirk?.isFatal == true) {
|
||||||
@@ -555,18 +547,8 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
private fun discoverAddress() {
|
private fun discoverAddress() {
|
||||||
working(AddAccountMessage.Progress.Discovering)
|
working(AddAccountMessage.Progress.Discovering)
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
// ⚠️ After the stored trust has landed, not before: reset first and
|
|
||||||
// the load would put the old address's trust back on top.
|
|
||||||
trustLoad?.join()
|
trustLoad?.join()
|
||||||
if (typedInput != trustAddress) {
|
when (val outcome = gateway.discover(typedInput, trust = trust)) {
|
||||||
trust = ServerTrust.DEFAULT
|
|
||||||
inheritedPins = false
|
|
||||||
trustAddress = typedInput
|
|
||||||
}
|
|
||||||
val outcome = discoverTrusting(addressStep(typedInput), AddAccountMessage.Progress.Discovering) {
|
|
||||||
gateway.discover(typedInput, trust = trust)
|
|
||||||
} ?: return@launch
|
|
||||||
when (outcome) {
|
|
||||||
is CalDavDiscovery.Outcome.Found -> onDiscovered(outcome)
|
is CalDavDiscovery.Outcome.Found -> onDiscovered(outcome)
|
||||||
|
|
||||||
is CalDavDiscovery.Outcome.NeedsAuthentication -> {
|
is CalDavDiscovery.Outcome.NeedsAuthentication -> {
|
||||||
@@ -588,8 +570,8 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
backToAddressOrServer(outcome.cause)
|
backToAddressOrServer(outcome.cause)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Asked about inside discoverTrusting, which only returns it declined.
|
is CalDavDiscovery.Outcome.UntrustedCertificate ->
|
||||||
is CalDavDiscovery.Outcome.UntrustedCertificate -> Unit
|
askToTrust(outcome.certificate, back = addressStep(typedInput)) { discoverAddress() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -602,49 +584,29 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
/** The warning is read and plain http is wanted anyway. */
|
/** The warning is read and plain http is wanted anyway. */
|
||||||
fun onCleartextConfirmed() {
|
fun onCleartextConfirmed() {
|
||||||
if (current.step !is AddAccountStep.ConfirmCleartext) return
|
if (current.step !is AddAccountStep.ConfirmCleartext) return
|
||||||
|
cleartextAddress = typedInput
|
||||||
trust = trust.copy(allowCleartext = true)
|
trust = trust.copy(allowCleartext = true)
|
||||||
trustAddress = typedInput
|
|
||||||
discoverAddress()
|
discoverAddress()
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The fingerprint is checked; pin it and re-run what it stopped. */
|
/** The fingerprint is checked; pin it and re-run what it stopped. */
|
||||||
fun onCertificateTrusted() {
|
fun onCertificateTrusted() {
|
||||||
val step = current.step as? AddAccountStep.TrustCertificate ?: return
|
val step = current.step as? AddAccountStep.TrustCertificate ?: return
|
||||||
val prompt = trustPrompt ?: return
|
val retry = trustRetry ?: return
|
||||||
trustPrompt = null
|
trust = trust.withCertificate(step.certificate.fingerprint)
|
||||||
val fingerprint = step.certificate.fingerprint
|
trustRetry = null
|
||||||
trust = if (inheritedPins) {
|
trustDeclined = null
|
||||||
trust.copy(pinnedCertificates = setOf(fingerprint.lowercase()))
|
retry()
|
||||||
} else {
|
|
||||||
trust.withCertificate(fingerprint)
|
|
||||||
}
|
|
||||||
inheritedPins = false
|
|
||||||
prompt.answer.complete(Unit)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
private fun askToTrust(certificate: ServerCertificate, back: AddAccountStep, retry: () -> Unit) {
|
||||||
* Runs [discover], and on a certificate the user could trust asks about it
|
// Already pinned and still refused: asking again could only loop.
|
||||||
* and runs it again once they have. Null when they declined; the step is
|
if (certificate.fingerprint in trust.pinnedCertificates) {
|
||||||
* then already [back].
|
return backToAddress(CalDavDiscovery.Outcome.Cause.TLS)
|
||||||
*/
|
|
||||||
private suspend fun discoverTrusting(
|
|
||||||
back: AddAccountStep,
|
|
||||||
progress: AddAccountMessage.Progress,
|
|
||||||
discover: suspend () -> CalDavDiscovery.Outcome,
|
|
||||||
): CalDavDiscovery.Outcome? {
|
|
||||||
while (true) {
|
|
||||||
val outcome = discover()
|
|
||||||
if (outcome !is CalDavDiscovery.Outcome.UntrustedCertificate) return outcome
|
|
||||||
val prompt = TrustPrompt(CompletableDeferred(), back)
|
|
||||||
trustPrompt = prompt
|
|
||||||
updateState { it.copy(step = AddAccountStep.TrustCertificate(outcome.certificate), openInBrowser = null) }
|
|
||||||
try {
|
|
||||||
prompt.answer.await()
|
|
||||||
} catch (_: CancellationException) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
working(progress)
|
|
||||||
}
|
}
|
||||||
|
trustRetry = retry
|
||||||
|
trustDeclined = back
|
||||||
|
updateState { it.copy(step = AddAccountStep.TrustCertificate(certificate), openInBrowser = null) }
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -701,11 +663,7 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
val root = serverRoot
|
val root = serverRoot
|
||||||
?: return@launch backToAddress(CalDavDiscovery.Outcome.Cause.NOT_AN_ADDRESS)
|
?: return@launch backToAddress(CalDavDiscovery.Outcome.Cause.NOT_AN_ADDRESS)
|
||||||
val credentials = CalDavGateway.Credentials(username, appPassword, root)
|
val credentials = CalDavGateway.Credentials(username, appPassword, root)
|
||||||
val outcome = discoverTrusting(
|
when (val outcome = gateway.discover(typedInput, credentials, trust)) {
|
||||||
AddAccountStep.EnterCredentials(username = username),
|
|
||||||
AddAccountMessage.Progress.SigningIn,
|
|
||||||
) { gateway.discover(typedInput, credentials, trust) } ?: return@launch
|
|
||||||
when (outcome) {
|
|
||||||
is CalDavDiscovery.Outcome.Found -> onDiscovered(outcome)
|
is CalDavDiscovery.Outcome.Found -> onDiscovered(outcome)
|
||||||
|
|
||||||
// A second rejection is the point at which naming the provider's
|
// A second rejection is the point at which naming the provider's
|
||||||
@@ -727,7 +685,10 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
|
|
||||||
is CalDavDiscovery.Outcome.NotCalDav -> backToAddressOrServer(outcome.cause)
|
is CalDavDiscovery.Outcome.NotCalDav -> backToAddressOrServer(outcome.cause)
|
||||||
is CalDavDiscovery.Outcome.Failed -> backToAddressOrServer(outcome.cause)
|
is CalDavDiscovery.Outcome.Failed -> backToAddressOrServer(outcome.cause)
|
||||||
is CalDavDiscovery.Outcome.UntrustedCertificate -> Unit
|
is CalDavDiscovery.Outcome.UntrustedCertificate -> askToTrust(
|
||||||
|
outcome.certificate,
|
||||||
|
back = AddAccountStep.EnterCredentials(username = username),
|
||||||
|
) { discoverWithCredentials() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -911,8 +872,7 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
/** Discovery with a password the login flow just minted, at the server that issued it. */
|
/** Discovery with a password the login flow just minted, at the server that issued it. */
|
||||||
private suspend fun discoverApproved(server: HttpUrl) {
|
private suspend fun discoverApproved(server: HttpUrl) {
|
||||||
working(AddAccountMessage.Progress.ReadingLists)
|
working(AddAccountMessage.Progress.ReadingLists)
|
||||||
val outcome = discoverTrusting(addressStep(typedInput), AddAccountMessage.Progress.ReadingLists) {
|
val outcome = gateway.discover(
|
||||||
gateway.discover(
|
|
||||||
// The server the credentials were *issued by*, not the
|
// The server the credentials were *issued by*, not the
|
||||||
// host the user typed — the two differ in exactly the
|
// host the user typed — the two differ in exactly the
|
||||||
// host-mismatch case this flow already models, and
|
// host-mismatch case this flow already models, and
|
||||||
@@ -921,7 +881,6 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
credentials = CalDavGateway.Credentials(username, appPassword, server),
|
credentials = CalDavGateway.Credentials(username, appPassword, server),
|
||||||
trust = trust,
|
trust = trust,
|
||||||
)
|
)
|
||||||
} ?: return
|
|
||||||
when (outcome) {
|
when (outcome) {
|
||||||
is CalDavDiscovery.Outcome.Found -> onDiscovered(outcome)
|
is CalDavDiscovery.Outcome.Found -> onDiscovered(outcome)
|
||||||
// ⚠️ Forward what actually happened. Reporting every
|
// ⚠️ Forward what actually happened. Reporting every
|
||||||
@@ -950,7 +909,10 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
CalDavDiscovery.Outcome.Unauthenticated ->
|
CalDavDiscovery.Outcome.Unauthenticated ->
|
||||||
backToAddress(CalDavDiscovery.Outcome.Cause.SERVER_ERROR)
|
backToAddress(CalDavDiscovery.Outcome.Cause.SERVER_ERROR)
|
||||||
|
|
||||||
is CalDavDiscovery.Outcome.UntrustedCertificate -> Unit
|
is CalDavDiscovery.Outcome.UntrustedCertificate ->
|
||||||
|
askToTrust(outcome.certificate, back = addressStep(typedInput)) {
|
||||||
|
viewModelScope.launch { discoverApproved(server) }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1150,10 +1112,10 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
is AddAccountStep.TrustCertificate -> {
|
is AddAccountStep.TrustCertificate -> {
|
||||||
val prompt = trustPrompt
|
val back = trustDeclined ?: addressStep(typedInput)
|
||||||
trustPrompt = null
|
trustRetry = null
|
||||||
prompt?.answer?.cancel()
|
trustDeclined = null
|
||||||
updateState { it.copy(step = prompt?.back ?: addressStep(typedInput), fatal = null) }
|
updateState { it.copy(step = back, fatal = null) }
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1201,10 +1163,9 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
trustLoad?.cancel()
|
trustLoad?.cancel()
|
||||||
trustLoad = null
|
trustLoad = null
|
||||||
trust = ServerTrust.DEFAULT
|
trust = ServerTrust.DEFAULT
|
||||||
trustAddress = null
|
cleartextAddress = null
|
||||||
inheritedPins = false
|
trustRetry = null
|
||||||
trustPrompt?.answer?.cancel()
|
trustDeclined = null
|
||||||
trustPrompt = null
|
|
||||||
current = AddAccountUiState()
|
current = AddAccountUiState()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1363,10 +1324,7 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
)
|
)
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
val credentials = CalDavGateway.Credentials(username, appPassword, root)
|
val credentials = CalDavGateway.Credentials(username, appPassword, root)
|
||||||
val outcome = discoverTrusting(addressStep(addressInput), AddAccountMessage.Progress.ReadingLists) {
|
when (val outcome = gateway.discover(target, credentials, trust)) {
|
||||||
gateway.discover(target, credentials, trust)
|
|
||||||
} ?: return@launch
|
|
||||||
when (outcome) {
|
|
||||||
is CalDavDiscovery.Outcome.Found -> onDiscovered(outcome, selection)
|
is CalDavDiscovery.Outcome.Found -> onDiscovered(outcome, selection)
|
||||||
is CalDavDiscovery.Outcome.NotCalDav -> backToAddressOrServer(outcome.cause)
|
is CalDavDiscovery.Outcome.NotCalDav -> backToAddressOrServer(outcome.cause)
|
||||||
is CalDavDiscovery.Outcome.Failed -> backToAddressOrServer(outcome.cause)
|
is CalDavDiscovery.Outcome.Failed -> backToAddressOrServer(outcome.cause)
|
||||||
@@ -1377,7 +1335,8 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
credentialsRejected()
|
credentialsRejected()
|
||||||
}
|
}
|
||||||
CalDavDiscovery.Outcome.Unauthenticated -> credentialsRejected()
|
CalDavDiscovery.Outcome.Unauthenticated -> credentialsRejected()
|
||||||
is CalDavDiscovery.Outcome.UntrustedCertificate -> Unit
|
is CalDavDiscovery.Outcome.UntrustedCertificate ->
|
||||||
|
askToTrust(outcome.certificate, back = addressStep(addressInput)) { resumeDiscovery(hasSetup) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1607,19 +1566,13 @@ class AddAccountViewModel @Inject constructor(
|
|||||||
const val KEY_FALLBACK_EMAIL = "add_account.fallback_email"
|
const val KEY_FALLBACK_EMAIL = "add_account.fallback_email"
|
||||||
const val KEY_TRUSTED_CERTIFICATES = "add_account.trusted_certificates"
|
const val KEY_TRUSTED_CERTIFICATES = "add_account.trusted_certificates"
|
||||||
const val KEY_CLEARTEXT = "add_account.cleartext"
|
const val KEY_CLEARTEXT = "add_account.cleartext"
|
||||||
const val KEY_TRUST_ADDRESS = "add_account.trust_address"
|
const val KEY_CLEARTEXT_ADDRESS = "add_account.cleartext_address"
|
||||||
const val KEY_INHERITED_PINS = "add_account.inherited_pins"
|
|
||||||
|
|
||||||
val TRUST_KEYS = ServerTrustKeys(KEY_TRUSTED_CERTIFICATES, KEY_CLEARTEXT)
|
|
||||||
|
|
||||||
/** What sends an email to the server field: no CalDAV on its domain, or nothing answering for it. */
|
/** What sends an email to the server field: no CalDAV on its domain, or nothing answering for it. */
|
||||||
val NO_SERVER_FOUND = setOf(
|
val NO_SERVER_FOUND = setOf(
|
||||||
CalDavDiscovery.Outcome.Cause.NOT_A_DAV_SERVER,
|
CalDavDiscovery.Outcome.Cause.NOT_A_DAV_SERVER,
|
||||||
CalDavDiscovery.Outcome.Cause.NO_CALENDAR_SUPPORT,
|
CalDavDiscovery.Outcome.Cause.NO_CALENDAR_SUPPORT,
|
||||||
CalDavDiscovery.Outcome.Cause.UNREACHABLE,
|
CalDavDiscovery.Outcome.Cause.UNREACHABLE,
|
||||||
// The domain's own host would not set up TLS: usually its website,
|
|
||||||
// not a CalDAV server, so the server field is the way on.
|
|
||||||
CalDavDiscovery.Outcome.Cause.TLS,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -11,9 +11,6 @@
|
|||||||
itself refuses an http:// URL for everyone else. This file cannot express a
|
itself refuses an http:// URL for everyone else. This file cannot express a
|
||||||
per-account choice, only a per-host one, and the hosts are the user's.
|
per-account choice, only a per-host one, and the hosts are the user's.
|
||||||
|
|
||||||
⚠️ That makes CalDavHttp the only gate. A client built any other way would
|
|
||||||
speak http silently, so HttpClientConstructionTest fails the build on one.
|
|
||||||
|
|
||||||
⚠️ KNOWN TRADE-OFF, and it is the widest form of this. base-config applies to
|
⚠️ KNOWN TRADE-OFF, and it is the widest form of this. base-config applies to
|
||||||
*all* traffic, so any CA in the user store — a corporate MDM profile, a "free
|
*all* traffic, so any CA in the user store — a corporate MDM profile, a "free
|
||||||
VPN" app's certificate, one installed during some earlier debugging — can
|
VPN" app's certificate, one installed during some earlier debugging — can
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import dagger.hilt.components.SingletonComponent
|
|||||||
import de.jeanlucmakiola.agendula.data.di.ApplicationScope
|
import de.jeanlucmakiola.agendula.data.di.ApplicationScope
|
||||||
import de.jeanlucmakiola.agendula.data.di.ChannelRefresher
|
import de.jeanlucmakiola.agendula.data.di.ChannelRefresher
|
||||||
import de.jeanlucmakiola.agendula.data.reminders.ReminderMaintenanceWorker
|
import de.jeanlucmakiola.agendula.data.reminders.ReminderMaintenanceWorker
|
||||||
import de.jeanlucmakiola.agendula.data.reminders.ReminderRefresher
|
|
||||||
import de.jeanlucmakiola.agendula.data.reminders.ReminderScheduler
|
import de.jeanlucmakiola.agendula.data.reminders.ReminderScheduler
|
||||||
import de.jeanlucmakiola.agendula.data.reminders.TaskNotifier
|
import de.jeanlucmakiola.agendula.data.reminders.TaskNotifier
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.ProviderResolver
|
import de.jeanlucmakiola.agendula.data.tasks.ProviderResolver
|
||||||
@@ -66,12 +65,15 @@ class AgendulaApp : Application(), Configuration.Provider {
|
|||||||
// v0.3.x install's tasks, both before anything reads a store.
|
// v0.3.x install's tasks, both before anything reads a store.
|
||||||
val startupGate = entryPoint.startupGate()
|
val startupGate = entryPoint.startupGate()
|
||||||
val scope = entryPoint.applicationScope()
|
val scope = entryPoint.applicationScope()
|
||||||
// A switch rebuilds the alarms through ReminderRefresher, which hears it
|
// An alarm is armed off whichever store was active when it was scheduled,
|
||||||
// as a store change. Channels only once startup's own null -> stored
|
// so a switch has to rebuild the set. Armed only once startup's own
|
||||||
// transition is past, which the launch sync below covers.
|
// null -> stored transition is past, which the launch sync below covers.
|
||||||
val started = AtomicBoolean(false)
|
val started = AtomicBoolean(false)
|
||||||
entryPoint.providerResolver().onModeChanged {
|
entryPoint.providerResolver().onModeChanged {
|
||||||
if (started.get()) runCatching { entryPoint.taskNotifier().refreshChannel() }
|
if (started.get()) {
|
||||||
|
scope.launch { runCatching { scheduler.sync() } }
|
||||||
|
runCatching { entryPoint.taskNotifier().refreshChannel() }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
startupGate.start()
|
startupGate.start()
|
||||||
refreshNotificationChannels()
|
refreshNotificationChannels()
|
||||||
@@ -86,7 +88,6 @@ class AgendulaApp : Application(), Configuration.Provider {
|
|||||||
scheduler.sync()
|
scheduler.sync()
|
||||||
}
|
}
|
||||||
runCatching { entryPoint.taskWidgetUpdater().start() }
|
runCatching { entryPoint.taskWidgetUpdater().start() }
|
||||||
runCatching { entryPoint.reminderRefresher().start() }
|
|
||||||
runCatching { entryPoint.providerSnapshotSource().start() }
|
runCatching { entryPoint.providerSnapshotSource().start() }
|
||||||
runCatching { ReminderMaintenanceWorker.schedule(this@AgendulaApp) }
|
runCatching { ReminderMaintenanceWorker.schedule(this@AgendulaApp) }
|
||||||
}
|
}
|
||||||
@@ -123,7 +124,6 @@ class AgendulaApp : Application(), Configuration.Provider {
|
|||||||
fun taskNotifier(): TaskNotifier
|
fun taskNotifier(): TaskNotifier
|
||||||
fun channelRefreshers(): Set<@JvmSuppressWildcards ChannelRefresher>
|
fun channelRefreshers(): Set<@JvmSuppressWildcards ChannelRefresher>
|
||||||
fun taskWidgetUpdater(): TaskWidgetUpdater
|
fun taskWidgetUpdater(): TaskWidgetUpdater
|
||||||
fun reminderRefresher(): ReminderRefresher
|
|
||||||
fun providerSnapshotSource(): ProviderSnapshotSource
|
fun providerSnapshotSource(): ProviderSnapshotSource
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,7 +16,6 @@ import androidx.compose.runtime.setValue
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.core.net.toUri
|
import androidx.core.net.toUri
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.SettingsPrefs
|
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.is24Hour
|
import de.jeanlucmakiola.agendula.data.prefs.is24Hour
|
||||||
import de.jeanlucmakiola.agendula.ui.common.LocalFirstDayOfWeek
|
import de.jeanlucmakiola.agendula.ui.common.LocalFirstDayOfWeek
|
||||||
import de.jeanlucmakiola.agendula.ui.common.LocalUse24HourFormat
|
import de.jeanlucmakiola.agendula.ui.common.LocalUse24HourFormat
|
||||||
@@ -34,12 +33,9 @@ import de.jeanlucmakiola.agendula.ui.crash.CrashReportActivity
|
|||||||
import de.jeanlucmakiola.agendula.ui.navigation.NavRequest
|
import de.jeanlucmakiola.agendula.ui.navigation.NavRequest
|
||||||
import de.jeanlucmakiola.agendula.ui.settings.SettingsViewModel
|
import de.jeanlucmakiola.agendula.ui.settings.SettingsViewModel
|
||||||
import de.jeanlucmakiola.agendula.ui.theme.AgendulaTheme
|
import de.jeanlucmakiola.agendula.ui.theme.AgendulaTheme
|
||||||
import de.jeanlucmakiola.agendula.ui.theme.SystemTheme
|
|
||||||
import de.jeanlucmakiola.floret.crash.CrashReportDialog
|
import de.jeanlucmakiola.floret.crash.CrashReportDialog
|
||||||
import de.jeanlucmakiola.floret.crash.CrashReporter
|
import de.jeanlucmakiola.floret.crash.CrashReporter
|
||||||
import de.jeanlucmakiola.floret.crash.submitCrashReport
|
import de.jeanlucmakiola.floret.crash.submitCrashReport
|
||||||
import kotlinx.coroutines.flow.distinctUntilChanged
|
|
||||||
import kotlinx.coroutines.flow.map
|
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
@@ -53,8 +49,6 @@ class MainActivity : ComponentActivity() {
|
|||||||
|
|
||||||
@Inject lateinit var launchHooks: Set<@JvmSuppressWildcards LaunchHook>
|
@Inject lateinit var launchHooks: Set<@JvmSuppressWildcards LaunchHook>
|
||||||
|
|
||||||
@Inject lateinit var settingsPrefs: SettingsPrefs
|
|
||||||
|
|
||||||
// A captured crash report awaiting the user's decision, surfaced as a dialog
|
// A captured crash report awaiting the user's decision, surfaced as a dialog
|
||||||
// over the app on the next launch (the single-crash path). A startup
|
// over the app on the next launch (the single-crash path). A startup
|
||||||
// crash-loop is handled out of band, before setContent — see below.
|
// crash-loop is handled out of band, before setContent — see below.
|
||||||
@@ -78,13 +72,6 @@ class MainActivity : ComponentActivity() {
|
|||||||
enableEdgeToEdge()
|
enableEdgeToEdge()
|
||||||
AppShortcuts.publish(this)
|
AppShortcuts.publish(this)
|
||||||
|
|
||||||
// The stored setting, never the view model's placeholder: a night mode
|
|
||||||
// that flips back and forth would recreate the activity each time.
|
|
||||||
lifecycleScope.launch {
|
|
||||||
settingsPrefs.settings.map { it.themeMode to it.dynamicColor }.distinctUntilChanged()
|
|
||||||
.collect { (mode, dynamicColor) -> SystemTheme.apply(this@MainActivity, mode, dynamicColor) }
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only on a fresh launch: after a rotation or process restore the intent
|
// Only on a fresh launch: after a rotation or process restore the intent
|
||||||
// is the same old one and the back stack already holds its destination.
|
// is the same old one and the back stack already holds its destination.
|
||||||
val fromHistory = intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
|
val fromHistory = intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
|
||||||
@@ -168,7 +155,6 @@ class MainActivity : ComponentActivity() {
|
|||||||
private const val EXTRA_LIST_ID = "de.jeanlucmakiola.agendula.extra.LIST_ID"
|
private const val EXTRA_LIST_ID = "de.jeanlucmakiola.agendula.extra.LIST_ID"
|
||||||
private const val EXTRA_RETURN_HOME = "de.jeanlucmakiola.agendula.extra.RETURN_HOME"
|
private const val EXTRA_RETURN_HOME = "de.jeanlucmakiola.agendula.extra.RETURN_HOME"
|
||||||
private const val EXTRA_PRESET_LIST_ID = "de.jeanlucmakiola.agendula.extra.PRESET_LIST_ID"
|
private const val EXTRA_PRESET_LIST_ID = "de.jeanlucmakiola.agendula.extra.PRESET_LIST_ID"
|
||||||
private const val EXTRA_DUE_TODAY = "de.jeanlucmakiola.agendula.extra.DUE_TODAY"
|
|
||||||
private const val SHARED_TITLE_LIMIT = 500
|
private const val SHARED_TITLE_LIMIT = 500
|
||||||
private const val NO_OCCURRENCE = -1L
|
private const val NO_OCCURRENCE = -1L
|
||||||
|
|
||||||
@@ -197,17 +183,13 @@ class MainActivity : ComponentActivity() {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* The launcher shortcut's, Quick Settings tile's and a widget's "New
|
* The launcher shortcut's, Quick Settings tile's and a widget's "New
|
||||||
* task". [listId] preset the list when it names exactly one, [dueToday]
|
* task". [listId] preset the list when it names exactly one; the data
|
||||||
* the due date for a Today widget; the data URI keeps each widget's
|
* URI keeps each widget's PendingIntent apart from the others.
|
||||||
* PendingIntent apart from the others.
|
|
||||||
*/
|
*/
|
||||||
fun newTaskIntent(context: Context, listId: Long? = null, dueToday: Boolean = false): Intent {
|
fun newTaskIntent(context: Context, listId: Long? = null): Intent =
|
||||||
val path = listOfNotNull(listId?.toString(), "today".takeIf { dueToday }).joinToString("/")
|
Intent(ACTION_NEW_TASK, listId?.let { "agendula://newtask/$it".toUri() }, context, MainActivity::class.java)
|
||||||
return Intent(ACTION_NEW_TASK, path.ifEmpty { null }?.let { "agendula://newtask/$it".toUri() }, context, MainActivity::class.java)
|
|
||||||
.putExtra(EXTRA_PRESET_LIST_ID, listId ?: -1L)
|
.putExtra(EXTRA_PRESET_LIST_ID, listId ?: -1L)
|
||||||
.putExtra(EXTRA_DUE_TODAY, dueToday)
|
|
||||||
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
||||||
}
|
|
||||||
|
|
||||||
fun todayIntent(context: Context): Intent =
|
fun todayIntent(context: Context): Intent =
|
||||||
Intent(ACTION_TODAY, null, context, MainActivity::class.java)
|
Intent(ACTION_TODAY, null, context, MainActivity::class.java)
|
||||||
@@ -241,7 +223,6 @@ class MainActivity : ComponentActivity() {
|
|||||||
when (intent.action) {
|
when (intent.action) {
|
||||||
ACTION_NEW_TASK -> return NavRequest.NewTask(
|
ACTION_NEW_TASK -> return NavRequest.NewTask(
|
||||||
listId = intent.getLongExtra(EXTRA_PRESET_LIST_ID, -1L).takeIf { it > 0L },
|
listId = intent.getLongExtra(EXTRA_PRESET_LIST_ID, -1L).takeIf { it > 0L },
|
||||||
dueToday = intent.getBooleanExtra(EXTRA_DUE_TODAY, false),
|
|
||||||
returnHome = true,
|
returnHome = true,
|
||||||
)
|
)
|
||||||
ACTION_TODAY -> return NavRequest.OpenSmart(SmartList.TODAY)
|
ACTION_TODAY -> return NavRequest.OpenSmart(SmartList.TODAY)
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ object DataProvideModule {
|
|||||||
// backed-up `.db` does not. The backup rules carry all three files and
|
// backed-up `.db` does not. The backup rules carry all three files and
|
||||||
// the app checkpoints on ON_STOP.
|
// the app checkpoints on ON_STOP.
|
||||||
.setJournalMode(RoomDatabase.JournalMode.WRITE_AHEAD_LOGGING)
|
.setJournalMode(RoomDatabase.JournalMode.WRITE_AHEAD_LOGGING)
|
||||||
.addMigrations(TasksDatabase.MIGRATION_1_2, TasksDatabase.MIGRATION_2_3, TasksDatabase.MIGRATION_3_4, TasksDatabase.MIGRATION_4_5, TasksDatabase.MIGRATION_5_6)
|
.addMigrations(TasksDatabase.MIGRATION_1_2, TasksDatabase.MIGRATION_2_3, TasksDatabase.MIGRATION_3_4)
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -54,9 +54,6 @@ fun TimeFormatPref.is24Hour(systemIs24Hour: Boolean): Boolean = when (this) {
|
|||||||
TimeFormatPref.TWENTY_FOUR_HOUR -> true
|
TimeFormatPref.TWENTY_FOUR_HOUR -> true
|
||||||
}
|
}
|
||||||
|
|
||||||
/** How much of a task's description a due reminder shows when expanded. */
|
|
||||||
enum class ReminderDescription { HIDDEN, SHORT, FULL }
|
|
||||||
|
|
||||||
const val DEFAULT_SNOOZE_MINUTES = 10
|
const val DEFAULT_SNOOZE_MINUTES = 10
|
||||||
/** Done starts folded away, to keep the open tasks in focus. */ val DEFAULT_COLLAPSED_SECTIONS: Set<TaskSection> = setOf(TaskSection.COMPLETED)
|
/** Done starts folded away, to keep the open tasks in focus. */ val DEFAULT_COLLAPSED_SECTIONS: Set<TaskSection> = setOf(TaskSection.COMPLETED)
|
||||||
|
|
||||||
@@ -106,7 +103,6 @@ data class Settings(
|
|||||||
val sortOrder: TaskSortOrder = TaskSortOrder.DUE,
|
val sortOrder: TaskSortOrder = TaskSortOrder.DUE,
|
||||||
/** How long a reminder's "Snooze" action puts it off. */
|
/** How long a reminder's "Snooze" action puts it off. */
|
||||||
val snoozeMinutes: Int = DEFAULT_SNOOZE_MINUTES,
|
val snoozeMinutes: Int = DEFAULT_SNOOZE_MINUTES,
|
||||||
val reminderDescription: ReminderDescription = ReminderDescription.SHORT,
|
|
||||||
val timeFormat: TimeFormatPref = TimeFormatPref.AUTO,
|
val timeFormat: TimeFormatPref = TimeFormatPref.AUTO,
|
||||||
/** The first day of the week; `null` follows the locale. */
|
/** The first day of the week; `null` follows the locale. */
|
||||||
val weekStart: DayOfWeek? = null,
|
val weekStart: DayOfWeek? = null,
|
||||||
@@ -142,14 +138,6 @@ data class Settings(
|
|||||||
/** The default reminders a task in [listId] takes — the one rule for which default applies. */
|
/** The default reminders a task in [listId] takes — the one rule for which default applies. */
|
||||||
fun defaultRemindersFor(listId: Long, allDay: Boolean): List<TaskReminder> =
|
fun defaultRemindersFor(listId: Long, allDay: Boolean): List<TaskReminder> =
|
||||||
(if (allDay) allDayReminderLeadsFor(listId) else reminderLeadsFor(listId)).map { it.asTaskReminder() }
|
(if (allDay) allDayReminderLeadsFor(listId) else reminderLeadsFor(listId)).map { it.asTaskReminder() }
|
||||||
|
|
||||||
/** Whether [listId] has its own default reminders for [allDay] tasks (an override, "none" included). */
|
|
||||||
fun hasOwnReminders(listId: Long, allDay: Boolean): Boolean =
|
|
||||||
listId in (if (allDay) perListAllDayReminderOverride else perListReminderOverride)
|
|
||||||
|
|
||||||
/** Whether [listId] has its own default reminders for timed or all-day tasks. */
|
|
||||||
fun hasOwnReminders(listId: Long): Boolean =
|
|
||||||
hasOwnReminders(listId, allDay = false) || hasOwnReminders(listId, allDay = true)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** App preferences, backed by DataStore. Mirrors Calendula's prefs shape. */
|
/** App preferences, backed by DataStore. Mirrors Calendula's prefs shape. */
|
||||||
@@ -183,9 +171,6 @@ class SettingsPrefs @Inject constructor(
|
|||||||
sortOrder = p[SORT_ORDER]?.let { runCatching { TaskSortOrder.valueOf(it) }.getOrNull() }
|
sortOrder = p[SORT_ORDER]?.let { runCatching { TaskSortOrder.valueOf(it) }.getOrNull() }
|
||||||
?: TaskSortOrder.DUE,
|
?: TaskSortOrder.DUE,
|
||||||
snoozeMinutes = p[SNOOZE_MINUTES]?.takeIf { it > 0 } ?: DEFAULT_SNOOZE_MINUTES,
|
snoozeMinutes = p[SNOOZE_MINUTES]?.takeIf { it > 0 } ?: DEFAULT_SNOOZE_MINUTES,
|
||||||
reminderDescription = p[REMINDER_DESCRIPTION]
|
|
||||||
?.let { runCatching { ReminderDescription.valueOf(it) }.getOrNull() }
|
|
||||||
?: ReminderDescription.SHORT,
|
|
||||||
timeFormat = p[TIME_FORMAT]?.let { runCatching { TimeFormatPref.valueOf(it) }.getOrNull() }
|
timeFormat = p[TIME_FORMAT]?.let { runCatching { TimeFormatPref.valueOf(it) }.getOrNull() }
|
||||||
?: TimeFormatPref.AUTO,
|
?: TimeFormatPref.AUTO,
|
||||||
autofocusTitle = p[AUTOFOCUS_TITLE] ?: true,
|
autofocusTitle = p[AUTOFOCUS_TITLE] ?: true,
|
||||||
@@ -214,9 +199,6 @@ class SettingsPrefs @Inject constructor(
|
|||||||
|
|
||||||
suspend fun setSnoozeMinutes(minutes: Int) = dataStore.edit { it[SNOOZE_MINUTES] = minutes.coerceAtLeast(1) }
|
suspend fun setSnoozeMinutes(minutes: Int) = dataStore.edit { it[SNOOZE_MINUTES] = minutes.coerceAtLeast(1) }
|
||||||
|
|
||||||
suspend fun setReminderDescription(pref: ReminderDescription) =
|
|
||||||
dataStore.edit { it[REMINDER_DESCRIPTION] = pref.name }
|
|
||||||
|
|
||||||
suspend fun setSyncIntervalMinutes(minutes: Int) = dataStore.edit { it[SYNC_INTERVAL] = minutes }
|
suspend fun setSyncIntervalMinutes(minutes: Int) = dataStore.edit { it[SYNC_INTERVAL] = minutes }
|
||||||
|
|
||||||
suspend fun setPushEnabled(enabled: Boolean) = dataStore.edit { it[PUSH_ENABLED] = enabled }
|
suspend fun setPushEnabled(enabled: Boolean) = dataStore.edit { it[PUSH_ENABLED] = enabled }
|
||||||
@@ -363,7 +345,6 @@ class SettingsPrefs @Inject constructor(
|
|||||||
val DEFAULT_EDIT_FIELDS = stringSetPreferencesKey("default_edit_fields")
|
val DEFAULT_EDIT_FIELDS = stringSetPreferencesKey("default_edit_fields")
|
||||||
val SORT_ORDER = stringPreferencesKey("sort_order")
|
val SORT_ORDER = stringPreferencesKey("sort_order")
|
||||||
val SNOOZE_MINUTES = intPreferencesKey("snooze_minutes")
|
val SNOOZE_MINUTES = intPreferencesKey("snooze_minutes")
|
||||||
val REMINDER_DESCRIPTION = stringPreferencesKey("reminder_description")
|
|
||||||
val TIME_FORMAT = stringPreferencesKey("time_format")
|
val TIME_FORMAT = stringPreferencesKey("time_format")
|
||||||
val WEEK_START = stringPreferencesKey("week_start")
|
val WEEK_START = stringPreferencesKey("week_start")
|
||||||
val AUTOFOCUS_TITLE = booleanPreferencesKey("autofocus_title")
|
val AUTOFOCUS_TITLE = booleanPreferencesKey("autofocus_title")
|
||||||
|
|||||||
+12
-47
@@ -5,7 +5,6 @@ import android.content.Context
|
|||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import androidx.core.net.toUri
|
import androidx.core.net.toUri
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.Settings
|
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.SettingsPrefs
|
import de.jeanlucmakiola.agendula.data.prefs.SettingsPrefs
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TaskQuery
|
import de.jeanlucmakiola.agendula.data.tasks.TaskQuery
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TasksDataSource
|
import de.jeanlucmakiola.agendula.data.tasks.TasksDataSource
|
||||||
@@ -16,7 +15,6 @@ import kotlinx.coroutines.SupervisorJob
|
|||||||
import kotlinx.coroutines.flow.first
|
import kotlinx.coroutines.flow.first
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
import kotlin.time.Instant
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fires when a task's reminder alarm goes off. Re-reads the task (it may have
|
* Fires when a task's reminder alarm goes off. Re-reads the task (it may have
|
||||||
@@ -46,7 +44,8 @@ class DueReminderReceiver : BroadcastReceiver() {
|
|||||||
}
|
}
|
||||||
val settings = settingsPrefs.settings.first()
|
val settings = settingsPrefs.settings.first()
|
||||||
if (!settings.remindersEnabled) return@launch
|
if (!settings.remindersEnabled) return@launch
|
||||||
runCatching { notifier.postIfOpen(dataSource, taskId, occurrence, settings) }
|
val task = runCatching { dataSource.occurrence(taskId, occurrence) }.getOrNull()
|
||||||
|
if (task != null && !task.isClosed) notifier.postDue(task, settings)
|
||||||
} finally {
|
} finally {
|
||||||
pending.finish()
|
pending.finish()
|
||||||
}
|
}
|
||||||
@@ -75,51 +74,17 @@ class DueReminderReceiver : BroadcastReceiver() {
|
|||||||
/**
|
/**
|
||||||
* The occurrence of [taskId] anchored at [occurrenceStart] (epoch millis), or the
|
* The occurrence of [taskId] anchored at [occurrenceStart] (epoch millis), or the
|
||||||
* task's current one when there is no anchor or it can no longer be found.
|
* task's current one when there is no anchor or it can no longer be found.
|
||||||
*
|
* [TasksDataSource.task] alone resolves a series to whichever occurrence is
|
||||||
* ⚠️ A ticked or edited occurrence is a row of its own with its own id, so
|
* current, which is not necessarily the one a reminder was armed for.
|
||||||
* matching list rows on [taskId] misses it; [TasksDataSource.task] with the
|
|
||||||
* anchor finds it by start. The list scan is for a provider whose exception
|
|
||||||
* rows that lookup does not reach.
|
|
||||||
*/
|
*/
|
||||||
internal fun TasksDataSource.occurrence(taskId: Long, occurrenceStart: Long): Task? {
|
internal fun TasksDataSource.occurrence(taskId: Long, occurrenceStart: Long): Task? {
|
||||||
val anchor = occurrenceStart.takeIf { it != ScheduledReminder.NO_OCCURRENCE }?.let(Instant::fromEpochMilliseconds)
|
val current = task(taskId) ?: return null
|
||||||
val found = task(taskId, anchor) ?: return null
|
if (occurrenceStart == ScheduledReminder.NO_OCCURRENCE ||
|
||||||
if (anchor == null || found.occurrenceStart == anchor) return found
|
current.occurrenceStart?.toEpochMilliseconds() == occurrenceStart
|
||||||
return tasks(TaskQuery(listId = found.listId, includeCompleted = true))
|
) {
|
||||||
.firstOrNull { (it.taskId == taskId || it.seriesId == taskId) && it.occurrenceStart == anchor }
|
return current
|
||||||
?: found
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Whether a reminder posted for [occurrenceStart] is done with, given [current]
|
|
||||||
* as [occurrence] resolved it.
|
|
||||||
*
|
|
||||||
* - No task: gone, but only when [missingMeansGone] — a provider that fails a
|
|
||||||
* read hands back nothing rather than throwing.
|
|
||||||
* - [occurrenceStart] null: posted before reminders recorded their occurrence,
|
|
||||||
* so only a task that does not recur can be judged.
|
|
||||||
* - A lookup that fell back to another occurrence says nothing about the
|
|
||||||
* reminded one, so it stays.
|
|
||||||
*/
|
|
||||||
internal fun reminderIsStale(occurrenceStart: Long?, current: Task?, missingMeansGone: Boolean): Boolean {
|
|
||||||
if (current == null) return missingMeansGone
|
|
||||||
val same = when (occurrenceStart) {
|
|
||||||
null -> current.occurrenceStart == null
|
|
||||||
ScheduledReminder.NO_OCCURRENCE -> true
|
|
||||||
else -> current.occurrenceStart?.toEpochMilliseconds() == occurrenceStart
|
|
||||||
}
|
}
|
||||||
return same && current.isClosed
|
return tasks(TaskQuery(listId = current.listId, includeCompleted = true))
|
||||||
}
|
.firstOrNull { it.taskId == taskId && it.occurrenceStart?.toEpochMilliseconds() == occurrenceStart }
|
||||||
|
?: current
|
||||||
/**
|
|
||||||
* Posts the reminder for [taskId]'s occurrence if it is still open, then checks
|
|
||||||
* once more: a completion landing between the read and the post may already
|
|
||||||
* have had its withdrawal pass, which ran before there was anything to withdraw.
|
|
||||||
*/
|
|
||||||
internal fun TaskNotifier.postIfOpen(dataSource: TasksDataSource, taskId: Long, occurrenceStart: Long, settings: Settings) {
|
|
||||||
val task = dataSource.occurrence(taskId, occurrenceStart) ?: return
|
|
||||||
if (task.isClosed) return
|
|
||||||
postDue(task, settings)
|
|
||||||
val now = runCatching { dataSource.occurrence(taskId, occurrenceStart) }.getOrElse { return }
|
|
||||||
if (now == null || now.isClosed) cancel(taskId)
|
|
||||||
}
|
}
|
||||||
+4
-1
@@ -32,6 +32,7 @@ class ReminderActionReceiver : BroadcastReceiver() {
|
|||||||
|
|
||||||
@Inject lateinit var notifier: TaskNotifier
|
@Inject lateinit var notifier: TaskNotifier
|
||||||
@Inject lateinit var snoozeScheduler: ReminderSnoozeScheduler
|
@Inject lateinit var snoozeScheduler: ReminderSnoozeScheduler
|
||||||
|
@Inject lateinit var reminderScheduler: ReminderScheduler
|
||||||
@Inject lateinit var repository: TasksRepository
|
@Inject lateinit var repository: TasksRepository
|
||||||
@Inject lateinit var dataSource: TasksDataSource
|
@Inject lateinit var dataSource: TasksDataSource
|
||||||
@Inject lateinit var settingsPrefs: SettingsPrefs
|
@Inject lateinit var settingsPrefs: SettingsPrefs
|
||||||
@@ -53,6 +54,7 @@ class ReminderActionReceiver : BroadcastReceiver() {
|
|||||||
val anchor = occurrence.takeIf { it != ScheduledReminder.NO_OCCURRENCE }
|
val anchor = occurrence.takeIf { it != ScheduledReminder.NO_OCCURRENCE }
|
||||||
?.let(Instant::fromEpochMilliseconds)
|
?.let(Instant::fromEpochMilliseconds)
|
||||||
repository.setCompleted(taskId, anchor, completed = true)
|
repository.setCompleted(taskId, anchor, completed = true)
|
||||||
|
reminderScheduler.sync()
|
||||||
}
|
}
|
||||||
|
|
||||||
ACTION_SNOOZE -> runCatching {
|
ACTION_SNOOZE -> runCatching {
|
||||||
@@ -65,7 +67,8 @@ class ReminderActionReceiver : BroadcastReceiver() {
|
|||||||
val settings = settingsPrefs.settings.first()
|
val settings = settingsPrefs.settings.first()
|
||||||
if (!settings.remindersEnabled) return@runCatching
|
if (!settings.remindersEnabled) return@runCatching
|
||||||
startupGate.awaitReady()
|
startupGate.awaitReady()
|
||||||
notifier.postIfOpen(dataSource, taskId, occurrence, settings)
|
val task = dataSource.occurrence(taskId, occurrence)
|
||||||
|
if (task != null && !task.isClosed) notifier.postDue(task, settings)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -21,9 +21,7 @@ internal data class ReminderDiff(
|
|||||||
fired: Set<ScheduledReminder> = emptySet(),
|
fired: Set<ScheduledReminder> = emptySet(),
|
||||||
isArmed: (ScheduledReminder) -> Boolean,
|
isArmed: (ScheduledReminder) -> Boolean,
|
||||||
): ReminderDiff {
|
): ReminderDiff {
|
||||||
// A fired entry counts even once the store dropped it, so a task
|
val live = previous.filterTo(HashSet()) { it in fired || isArmed(it) }
|
||||||
// reopened within the grace does not ring again.
|
|
||||||
val live = previous.filterTo(HashSet()) { it in fired || isArmed(it) } + fired
|
|
||||||
return ReminderDiff(
|
return ReminderDiff(
|
||||||
cancel = live - desired,
|
cancel = live - desired,
|
||||||
arm = desired - live,
|
arm = desired - live,
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.reminders
|
|
||||||
|
|
||||||
import de.jeanlucmakiola.agendula.data.di.ApplicationScope
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.StoreChangeDebouncer
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TasksDataSource
|
|
||||||
import kotlinx.coroutines.CoroutineScope
|
|
||||||
import javax.inject.Inject
|
|
||||||
import javax.inject.Singleton
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Keeps reminders in step with the store: any change to tasks, lists or alarms —
|
|
||||||
* a tick in the list or on a widget, a sync pulling in a completion from another
|
|
||||||
* device, an edit, a store switch — runs one debounced [ReminderScheduler.sync].
|
|
||||||
* Started once from `AgendulaApp`, after the startup gate, so it observes the
|
|
||||||
* right store.
|
|
||||||
*/
|
|
||||||
@Singleton
|
|
||||||
class ReminderRefresher @Inject constructor(
|
|
||||||
dataSource: TasksDataSource,
|
|
||||||
scheduler: ReminderScheduler,
|
|
||||||
@ApplicationScope scope: CoroutineScope,
|
|
||||||
) {
|
|
||||||
private val changes = StoreChangeDebouncer(scope, DEBOUNCE_MILLIS, dataSource::registerTaskObserver) { scheduler.sync() }
|
|
||||||
|
|
||||||
fun start() {
|
|
||||||
changes.start()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Re-sync soon, folded into any pass a store change already asked for. */
|
|
||||||
fun requestRefresh() = changes.request()
|
|
||||||
|
|
||||||
private companion object {
|
|
||||||
const val DEBOUNCE_MILLIS = 1_000L
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -8,7 +8,6 @@ import dagger.hilt.android.qualifiers.ApplicationContext
|
|||||||
import de.jeanlucmakiola.agendula.data.di.IoDispatcher
|
import de.jeanlucmakiola.agendula.data.di.IoDispatcher
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.SettingsPrefs
|
import de.jeanlucmakiola.agendula.data.prefs.SettingsPrefs
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.ProviderResolver
|
import de.jeanlucmakiola.agendula.data.tasks.ProviderResolver
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.StorageMode
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TaskQuery
|
import de.jeanlucmakiola.agendula.data.tasks.TaskQuery
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TasksDataSource
|
import de.jeanlucmakiola.agendula.data.tasks.TasksDataSource
|
||||||
import kotlinx.coroutines.CoroutineDispatcher
|
import kotlinx.coroutines.CoroutineDispatcher
|
||||||
@@ -24,9 +23,8 @@ import javax.inject.Singleton
|
|||||||
* The self-scheduled due-reminder engine. Nothing else delivers task reminders —
|
* The self-scheduled due-reminder engine. Nothing else delivers task reminders —
|
||||||
* not the platform, not a tasks provider — so Agendula reads upcoming due tasks
|
* not the platform, not a tasks provider — so Agendula reads upcoming due tasks
|
||||||
* and arms one exact [AlarmManager] alarm per reminder, within a rolling window. Re-run
|
* and arms one exact [AlarmManager] alarm per reminder, within a rolling window. Re-run
|
||||||
* on app start, on boot, on a store switch and on every change to the store (see
|
* on app start, on boot, on a store switch, and on an external provider change;
|
||||||
* [ReminderRefresher]); it diffs against [ScheduledReminderStore] so only changed
|
* it diffs against [ScheduledReminderStore] so only changed alarms move.
|
||||||
* alarms move, and takes down posted reminders whose task is done with.
|
|
||||||
*/
|
*/
|
||||||
@Singleton
|
@Singleton
|
||||||
class ReminderScheduler @Inject constructor(
|
class ReminderScheduler @Inject constructor(
|
||||||
@@ -36,7 +34,6 @@ class ReminderScheduler @Inject constructor(
|
|||||||
private val store: ScheduledReminderStore,
|
private val store: ScheduledReminderStore,
|
||||||
private val providerResolver: ProviderResolver,
|
private val providerResolver: ProviderResolver,
|
||||||
private val snoozeScheduler: ReminderSnoozeScheduler,
|
private val snoozeScheduler: ReminderSnoozeScheduler,
|
||||||
private val notifier: TaskNotifier,
|
|
||||||
@IoDispatcher private val io: CoroutineDispatcher,
|
@IoDispatcher private val io: CoroutineDispatcher,
|
||||||
) {
|
) {
|
||||||
private val syncLock = Mutex()
|
private val syncLock = Mutex()
|
||||||
@@ -68,23 +65,19 @@ class ReminderScheduler @Inject constructor(
|
|||||||
// Gate on whether the store is readable, not on whether a provider
|
// Gate on whether the store is readable, not on whether a provider
|
||||||
// resolves: our own store deliberately resolves to no provider, so the
|
// resolves: our own store deliberately resolves to no provider, so the
|
||||||
// latter clears every reminder in the default mode.
|
// latter clears every reminder in the default mode.
|
||||||
val readable = providerResolver.canReadStore()
|
if (!settings.remindersEnabled || !providerResolver.canReadStore()) {
|
||||||
if (!settings.remindersEnabled || !readable) {
|
|
||||||
clearAll()
|
clearAll()
|
||||||
// Switched off, a reminder already up still goes when its task does.
|
|
||||||
if (readable) withdrawStale()
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
val tasks = runCatching { dataSource.tasks(TaskQuery(includeCompleted = false)) }
|
val tasks = runCatching { dataSource.tasks(TaskQuery(includeCompleted = false)) }
|
||||||
.getOrElse { return }
|
.getOrElse { return }
|
||||||
// Per-task leads. One query for all of them.
|
// Per-task leads. One query for all of them.
|
||||||
val perTask = runCatching { dataSource.reminders() }.getOrElse { emptyMap() }
|
val perTask = runCatching { dataSource.reminders() }.getOrElse { emptyMap() }
|
||||||
val now = System.currentTimeMillis()
|
|
||||||
val desired = ReminderPlanner.plan(
|
val desired = ReminderPlanner.plan(
|
||||||
tasks = tasks,
|
tasks = tasks,
|
||||||
perTask = perTask,
|
perTask = perTask,
|
||||||
settings = settings,
|
settings = settings,
|
||||||
now = now,
|
now = System.currentTimeMillis(),
|
||||||
zone = ZoneId.systemDefault(),
|
zone = ZoneId.systemDefault(),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -99,10 +92,7 @@ class ReminderScheduler @Inject constructor(
|
|||||||
|
|
||||||
// ⚠️ The store survives reboot, force-stop and restore; the alarms don't.
|
// ⚠️ The store survives reboot, force-stop and restore; the alarms don't.
|
||||||
// Trusting it alone left every reminder after a reboot unarmed for good.
|
// Trusting it alone left every reminder after a reboot unarmed for good.
|
||||||
// ⚠️ Kept through the missed-reminder grace even once it drops out of
|
val fired = store.fired()
|
||||||
// the plan: a tick undone a moment later would otherwise re-arm a
|
|
||||||
// trigger in the past, and the reminder would ring a second time.
|
|
||||||
val fired = store.fired().filterTo(HashSet()) { it in desired || it.triggerAt >= now - ReminderPlanner.MISSED_GRACE_MS }
|
|
||||||
val diff = ReminderDiff.of(store.all(), desired, fired) { !afterReboot && !rearm && isArmed(it) }
|
val diff = ReminderDiff.of(store.all(), desired, fired) { !afterReboot && !rearm && isArmed(it) }
|
||||||
diff.cancel.forEach { cancel(it) }
|
diff.cancel.forEach { cancel(it) }
|
||||||
// ⚠️ Only what was actually armed. A throw mid-loop used to skip the
|
// ⚠️ Only what was actually armed. A throw mid-loop used to skip the
|
||||||
@@ -110,25 +100,7 @@ class ReminderScheduler @Inject constructor(
|
|||||||
// — uncancellable, and firing for tasks that no longer exist — and the
|
// — uncancellable, and firing for tasks that no longer exist — and the
|
||||||
// exception escaped into BootReceiver's goAsync().
|
// exception escaped into BootReceiver's goAsync().
|
||||||
val armed = diff.arm.filter { schedule(it) }
|
val armed = diff.arm.filter { schedule(it) }
|
||||||
store.replace(diff.keep + armed, fired = fired, exact = canExact)
|
store.replace(diff.keep + armed, fired = fired intersect desired, exact = canExact)
|
||||||
withdrawStale()
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A reminder already on screen outlives its alarm: completing the task in
|
|
||||||
* the list, on a widget or on another device has to take it down too.
|
|
||||||
*/
|
|
||||||
private fun withdrawStale() {
|
|
||||||
// Only our own store tells a deleted task from a failed read.
|
|
||||||
val missingMeansGone = providerResolver.mode() == StorageMode.OWN
|
|
||||||
runCatching {
|
|
||||||
notifier.withdrawStale { taskId, occurrence ->
|
|
||||||
runCatching {
|
|
||||||
val current = dataSource.occurrence(taskId, occurrence ?: ScheduledReminder.NO_OCCURRENCE)
|
|
||||||
reminderIsStale(occurrence, current, missingMeansGone)
|
|
||||||
}.getOrDefault(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Whether the system still holds this alarm's PendingIntent. */
|
/** Whether the system still holds this alarm's PendingIntent. */
|
||||||
|
|||||||
@@ -10,16 +10,13 @@ import android.content.Context
|
|||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.pm.PackageManager
|
import android.content.pm.PackageManager
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Bundle
|
|
||||||
import android.text.format.DateFormat
|
import android.text.format.DateFormat
|
||||||
import android.util.TypedValue
|
|
||||||
import androidx.core.app.NotificationCompat
|
import androidx.core.app.NotificationCompat
|
||||||
import androidx.core.app.NotificationManagerCompat
|
import androidx.core.app.NotificationManagerCompat
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.core.content.edit
|
import androidx.core.content.edit
|
||||||
import de.jeanlucmakiola.agendula.MainActivity
|
import de.jeanlucmakiola.agendula.MainActivity
|
||||||
import de.jeanlucmakiola.agendula.R
|
import de.jeanlucmakiola.agendula.R
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.ReminderDescription
|
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.Settings
|
import de.jeanlucmakiola.agendula.data.prefs.Settings
|
||||||
import de.jeanlucmakiola.agendula.domain.readableDescription
|
import de.jeanlucmakiola.agendula.domain.readableDescription
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.is24Hour
|
import de.jeanlucmakiola.agendula.data.prefs.is24Hour
|
||||||
@@ -32,7 +29,6 @@ import de.jeanlucmakiola.agendula.domain.calendarDate
|
|||||||
import dagger.hilt.android.qualifiers.ApplicationContext
|
import dagger.hilt.android.qualifiers.ApplicationContext
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import java.text.BreakIterator
|
|
||||||
import java.time.Instant as JInstant
|
import java.time.Instant as JInstant
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
import java.time.ZoneId
|
import java.time.ZoneId
|
||||||
@@ -89,9 +85,7 @@ class TaskNotifier @Inject constructor(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
val description = reminderBody(settings.reminderDescription, lineChars()) {
|
val description = task.description?.readableDescription()?.trim()?.takeIf { it.isNotBlank() }
|
||||||
task.description?.readableDescription()
|
|
||||||
}
|
|
||||||
val tapIntent = PendingIntent.getActivity(
|
val tapIntent = PendingIntent.getActivity(
|
||||||
context,
|
context,
|
||||||
task.taskId.toInt(),
|
task.taskId.toInt(),
|
||||||
@@ -109,11 +103,6 @@ class TaskNotifier @Inject constructor(
|
|||||||
.setPriority(NotificationCompat.PRIORITY_HIGH)
|
.setPriority(NotificationCompat.PRIORITY_HIGH)
|
||||||
.setAutoCancel(true)
|
.setAutoCancel(true)
|
||||||
.setContentIntent(tapIntent)
|
.setContentIntent(tapIntent)
|
||||||
.addExtras(
|
|
||||||
Bundle().apply {
|
|
||||||
putLong(EXTRA_OCCURRENCE, task.occurrenceStart?.toEpochMilliseconds() ?: ScheduledReminder.NO_OCCURRENCE)
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.addAction(0, context.getString(R.string.reminder_action_done), actionIntent(task, ReminderActionReceiver.ACTION_DONE))
|
.addAction(0, context.getString(R.string.reminder_action_done), actionIntent(task, ReminderActionReceiver.ACTION_DONE))
|
||||||
.addAction(
|
.addAction(
|
||||||
0,
|
0,
|
||||||
@@ -124,38 +113,10 @@ class TaskNotifier @Inject constructor(
|
|||||||
NotificationManagerCompat.from(context).notify(task.taskId.toString(), NOTIFICATION_ID, notification)
|
NotificationManagerCompat.from(context).notify(task.taskId.toString(), NOTIFICATION_ID, notification)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Characters per line of an expanded notification on this screen, at the user's font size. */
|
|
||||||
private fun lineChars(): Int {
|
|
||||||
val res = context.resources
|
|
||||||
val widthDp = (res.configuration.screenWidthDp - NOTIFICATION_INSET_DP).toFloat()
|
|
||||||
return notificationLineChars(
|
|
||||||
textWidthPx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, widthDp, res.displayMetrics),
|
|
||||||
textSizePx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, NOTIFICATION_TEXT_SP, res.displayMetrics),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun cancel(taskId: Long) {
|
fun cancel(taskId: Long) {
|
||||||
NotificationManagerCompat.from(context).cancel(taskId.toString(), NOTIFICATION_ID)
|
NotificationManagerCompat.from(context).cancel(taskId.toString(), NOTIFICATION_ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Takes down every posted reminder [isStale] says is done with — completed,
|
|
||||||
* cancelled or deleted since it went off, here or on another device. The
|
|
||||||
* occurrence is null for a reminder posted before it was recorded.
|
|
||||||
*/
|
|
||||||
fun withdrawStale(isStale: (taskId: Long, occurrenceStart: Long?) -> Boolean) {
|
|
||||||
// Only the current store's: another store's task ids name other tasks.
|
|
||||||
val prefix = "$LIST_CHANNEL_PREFIX${resolver.mode().name.lowercase()}_"
|
|
||||||
manager.activeNotifications
|
|
||||||
.filter { it.id == NOTIFICATION_ID && it.notification.channelId?.startsWith(prefix) == true }
|
|
||||||
.forEach { posted ->
|
|
||||||
val taskId = posted.tag?.toLongOrNull() ?: return@forEach
|
|
||||||
val extras = posted.notification.extras
|
|
||||||
val occurrence = if (extras.containsKey(EXTRA_OCCURRENCE)) extras.getLong(EXTRA_OCCURRENCE) else null
|
|
||||||
if (isStale(taskId, occurrence)) cancel(taskId)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun actionIntent(task: Task, action: String): PendingIntent = PendingIntent.getBroadcast(
|
private fun actionIntent(task: Task, action: String): PendingIntent = PendingIntent.getBroadcast(
|
||||||
context,
|
context,
|
||||||
task.taskId.toInt(),
|
task.taskId.toInt(),
|
||||||
@@ -229,7 +190,6 @@ class TaskNotifier @Inject constructor(
|
|||||||
private const val LEGACY_CHANNEL_ID = "task_reminders"
|
private const val LEGACY_CHANNEL_ID = "task_reminders"
|
||||||
private const val LIST_CHANNEL_PREFIX = "reminders_"
|
private const val LIST_CHANNEL_PREFIX = "reminders_"
|
||||||
private const val NOTIFICATION_ID = 1
|
private const val NOTIFICATION_ID = 1
|
||||||
private const val EXTRA_OCCURRENCE = "de.jeanlucmakiola.agendula.extra.OCCURRENCE_START"
|
|
||||||
private const val CHANNEL_PREFS = "reminder_channels"
|
private const val CHANNEL_PREFS = "reminder_channels"
|
||||||
private const val KEY_LEGACY_IMPORTANCE = "legacy_importance"
|
private const val KEY_LEGACY_IMPORTANCE = "legacy_importance"
|
||||||
|
|
||||||
@@ -292,163 +252,3 @@ internal fun expandedText(dueLine: String?, description: String?): String? = whe
|
|||||||
dueLine == null -> description
|
dueLine == null -> description
|
||||||
else -> "$dueLine\n\n$description"
|
else -> "$dueLine\n\n$description"
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Characters per line assumed when the screen is not known. */
|
|
||||||
internal const val NOTIFICATION_LINE_CHARS = 40
|
|
||||||
|
|
||||||
/** A notification's body text size. */
|
|
||||||
internal const val NOTIFICATION_TEXT_SP = 14f
|
|
||||||
|
|
||||||
/** Width the expanded text doesn't get: the shade's margins, the template's padding and its icon column. */
|
|
||||||
internal const val NOTIFICATION_INSET_DP = 2 * 16 + 2 * 16 + 40
|
|
||||||
|
|
||||||
/** Average glyph advance as a share of the text size, for Latin body text. */
|
|
||||||
private const val AVERAGE_CHAR_EM = 0.52f
|
|
||||||
|
|
||||||
/** How many average characters fit on a [textWidthPx] wide line of [textSizePx] text. */
|
|
||||||
internal fun notificationLineChars(textWidthPx: Float, textSizePx: Float): Int =
|
|
||||||
if (textWidthPx <= 0f || textSizePx <= 0f) NOTIFICATION_LINE_CHARS
|
|
||||||
else (textWidthPx / (textSizePx * AVERAGE_CHAR_EM)).toInt().coerceAtLeast(10)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The description a reminder shows, as [mode] asks; null when there is none to
|
|
||||||
* show. [description] is only read when the mode shows it.
|
|
||||||
*/
|
|
||||||
internal fun reminderBody(
|
|
||||||
mode: ReminderDescription,
|
|
||||||
lineChars: Int = NOTIFICATION_LINE_CHARS,
|
|
||||||
description: () -> String?,
|
|
||||||
): String? {
|
|
||||||
if (mode == ReminderDescription.HIDDEN) return null
|
|
||||||
val text = description()?.trim()?.takeIf { it.isNotBlank() } ?: return null
|
|
||||||
return when (mode) {
|
|
||||||
ReminderDescription.HIDDEN -> null
|
|
||||||
ReminderDescription.SHORT -> shortDescription(text, lineChars = lineChars)
|
|
||||||
ReminderDescription.FULL -> text
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [description] cut to about [maxLines] lines of an expanded notification,
|
|
||||||
* ending in an ellipsis when anything was left out. A long line counts as the
|
|
||||||
* lines it wraps to and a blank line as one; text that fits comes back unchanged.
|
|
||||||
*/
|
|
||||||
internal fun shortDescription(
|
|
||||||
description: String,
|
|
||||||
maxLines: Int = 3,
|
|
||||||
lineChars: Int = NOTIFICATION_LINE_CHARS,
|
|
||||||
): String {
|
|
||||||
val perLine = lineChars.coerceAtLeast(2)
|
|
||||||
val kept = mutableListOf<String>()
|
|
||||||
var rowsLeft = maxLines
|
|
||||||
val lines = description.lineSequence().iterator()
|
|
||||||
while (lines.hasNext()) {
|
|
||||||
val line = lines.next()
|
|
||||||
val last = !lines.hasNext()
|
|
||||||
val width = displayWidth(line)
|
|
||||||
val rows = ((width + perLine - 1) / perLine).coerceAtLeast(1)
|
|
||||||
// The ellipsis after a line that ends the budget needs a cell of its own.
|
|
||||||
val fits = rows < rowsLeft || (rows == rowsLeft && (last || width < rows * perLine))
|
|
||||||
if (fits) {
|
|
||||||
if (last) return description
|
|
||||||
kept += line
|
|
||||||
rowsLeft -= rows
|
|
||||||
if (rowsLeft == 0) return ellipsize(kept)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if (rowsLeft > 0) kept += cutAtWord(line, rowsLeft * perLine - 1)
|
|
||||||
return ellipsize(kept)
|
|
||||||
}
|
|
||||||
return description
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun ellipsize(lines: List<String>): String =
|
|
||||||
lines.joinToString("\n").trimEnd { it.isWhitespace() || it in ".,;:" } + "…"
|
|
||||||
|
|
||||||
/** [line] cut to at most [max] cells, at a word break when there is one, never inside a character. */
|
|
||||||
private fun cutAtWord(line: String, max: Int): String {
|
|
||||||
var end = 0
|
|
||||||
var width = 0
|
|
||||||
forEachGrapheme(line) { _, clusterEnd, cells ->
|
|
||||||
width += cells
|
|
||||||
if (width > max) return@forEachGrapheme false
|
|
||||||
end = clusterEnd
|
|
||||||
true
|
|
||||||
}
|
|
||||||
if (end >= line.length || line[end].isWhitespace()) return line.substring(0, end)
|
|
||||||
val cut = line.substring(0, end)
|
|
||||||
val space = cut.indexOfLast { it.isWhitespace() }
|
|
||||||
return if (space > end / 2) cut.substring(0, space) else cut
|
|
||||||
}
|
|
||||||
|
|
||||||
/** How many cells [text] takes; see [clusterCells]. */
|
|
||||||
internal fun displayWidth(text: String): Int {
|
|
||||||
var width = 0
|
|
||||||
forEachGrapheme(text) { _, _, cells ->
|
|
||||||
width += cells
|
|
||||||
true
|
|
||||||
}
|
|
||||||
return width
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Calls [action] with each grapheme cluster's bounds and cells, until it returns false. */
|
|
||||||
private inline fun forEachGrapheme(text: String, action: (start: Int, end: Int, cells: Int) -> Boolean) {
|
|
||||||
val clusters = BreakIterator.getCharacterInstance()
|
|
||||||
clusters.setText(text)
|
|
||||||
var start = clusters.first()
|
|
||||||
var end = clusters.next()
|
|
||||||
while (end != BreakIterator.DONE) {
|
|
||||||
if (!action(start, end, clusterCells(text, start, end))) return
|
|
||||||
start = end
|
|
||||||
end = clusters.next()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cells one grapheme cluster takes: none for lone marks and selectors, two for
|
|
||||||
* emoji and East Asian wide characters, one otherwise.
|
|
||||||
*/
|
|
||||||
private fun clusterCells(text: String, start: Int, end: Int): Int {
|
|
||||||
var base = -1
|
|
||||||
var emoji = false
|
|
||||||
var i = start
|
|
||||||
while (i < end) {
|
|
||||||
val codePoint = text.codePointAt(i)
|
|
||||||
if (codePoint == EMOJI_PRESENTATION || isPictographic(codePoint)) emoji = true
|
|
||||||
if (base < 0 && !isZeroWidth(codePoint)) base = codePoint
|
|
||||||
i += Character.charCount(codePoint)
|
|
||||||
}
|
|
||||||
return when {
|
|
||||||
base < 0 -> 0
|
|
||||||
emoji || WIDE_RANGES.any { base in it } -> 2
|
|
||||||
else -> 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private const val EMOJI_PRESENTATION = 0xFE0F
|
|
||||||
|
|
||||||
private fun isZeroWidth(codePoint: Int): Boolean = when (Character.getType(codePoint).toByte()) {
|
|
||||||
Character.NON_SPACING_MARK, Character.ENCLOSING_MARK, Character.FORMAT -> true
|
|
||||||
else -> codePoint in 0xFE00..0xFE0F || codePoint in 0xE0100..0xE01EF
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Emoji blocks, approximating Extended_Pictographic without ICU. */
|
|
||||||
private fun isPictographic(codePoint: Int): Boolean =
|
|
||||||
codePoint in 0x1F000..0x1FAFF || codePoint in 0x2600..0x27BF ||
|
|
||||||
codePoint in 0x2300..0x23FF || codePoint in 0x2B00..0x2BFF
|
|
||||||
|
|
||||||
/** East Asian Wide and Fullwidth: Hangul, CJK punctuation, kana, Han, fullwidth forms. */
|
|
||||||
private val WIDE_RANGES = listOf(
|
|
||||||
0x1100..0x115F,
|
|
||||||
0x2E80..0x303E,
|
|
||||||
0x3041..0x33FF,
|
|
||||||
0x3400..0x4DBF,
|
|
||||||
0x4E00..0x9FFF,
|
|
||||||
0xA000..0xA4CF,
|
|
||||||
0xAC00..0xD7A3,
|
|
||||||
0xF900..0xFAFF,
|
|
||||||
0xFE30..0xFE4F,
|
|
||||||
0xFF00..0xFF60,
|
|
||||||
0xFFE0..0xFFE6,
|
|
||||||
0x20000..0x3FFFD,
|
|
||||||
)
|
|
||||||
+102
-697
@@ -7,12 +7,9 @@ import android.content.ContentUris
|
|||||||
import android.content.ContentValues
|
import android.content.ContentValues
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.database.ContentObserver
|
import android.database.ContentObserver
|
||||||
import android.database.Cursor
|
|
||||||
import android.database.sqlite.SQLiteException
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
import android.os.Looper
|
import android.os.Looper
|
||||||
import android.util.Log
|
|
||||||
import dagger.hilt.android.qualifiers.ApplicationContext
|
import dagger.hilt.android.qualifiers.ApplicationContext
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TasksContract.Instances
|
import de.jeanlucmakiola.agendula.data.tasks.TasksContract.Instances
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TasksContract.Lists
|
import de.jeanlucmakiola.agendula.data.tasks.TasksContract.Lists
|
||||||
@@ -25,8 +22,6 @@ import de.jeanlucmakiola.agendula.domain.TaskForm
|
|||||||
import de.jeanlucmakiola.agendula.domain.TaskList
|
import de.jeanlucmakiola.agendula.domain.TaskList
|
||||||
import de.jeanlucmakiola.agendula.domain.export.ExportTask
|
import de.jeanlucmakiola.agendula.domain.export.ExportTask
|
||||||
import de.jeanlucmakiola.agendula.domain.normalizeTags
|
import de.jeanlucmakiola.agendula.domain.normalizeTags
|
||||||
import de.jeanlucmakiola.agendula.domain.statusFromInt
|
|
||||||
import de.jeanlucmakiola.agendula.domain.toInt
|
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.ExpansionWindow
|
import de.jeanlucmakiola.agendula.domain.recurrence.ExpansionWindow
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceExpander
|
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceExpander
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceSpec
|
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceSpec
|
||||||
@@ -57,46 +52,13 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
// --- reads ----------------------------------------------------------------
|
// --- reads ----------------------------------------------------------------
|
||||||
|
|
||||||
override fun taskLists(): List<TaskList> {
|
override fun taskLists(): List<TaskList> {
|
||||||
val authority = authority()
|
val uri = TasksContract.listsUri(authority())
|
||||||
val lists = resolver.query(TasksContract.listsUri(authority), TaskProjections.LISTS, null, null, null)?.use { c ->
|
val sort = "${Lists.ACCOUNT_NAME}, ${Lists.NAME}"
|
||||||
|
return resolver.query(uri, TaskProjections.LISTS, null, null, sort)?.use { c ->
|
||||||
val reader = CursorColumnReader(c)
|
val reader = CursorColumnReader(c)
|
||||||
buildList<TaskList> { while (c.moveToNext()) add(TaskMapper.taskList(reader)) }
|
buildList { while (c.moveToNext()) add(TaskMapper.taskList(reader)) }
|
||||||
} ?: return emptyList()
|
} ?: emptyList()
|
||||||
val order = synchronized(listOrderLock) {
|
|
||||||
val stored = storedListOrder(authority)
|
|
||||||
val known = lists.mapTo(HashSet()) { it.id }
|
|
||||||
// A list gone from the provider takes its position along, as its id may be
|
|
||||||
// reused — but not on an empty answer, which is as likely a provider mid-update.
|
|
||||||
if (lists.isNotEmpty() && stored.keys.any { it !in known }) {
|
|
||||||
stored.filterKeys { it in known }.also { storeListOrder(authority, it) }
|
|
||||||
} else {
|
|
||||||
stored
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return ListOrder.sorted(lists, order)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The order Agendula keeps for [authority]'s lists. */
|
|
||||||
internal fun storedListOrder(authority: String = authority()): Map<Long, Int> =
|
|
||||||
ListOrder.decode(listOrder.getString(authority, null))
|
|
||||||
|
|
||||||
private val listOrder get() = context.getSharedPreferences(LIST_ORDER, Context.MODE_PRIVATE)
|
|
||||||
|
|
||||||
private fun storeListOrder(authority: String, order: Map<Long, Int>) {
|
|
||||||
listOrder.edit().putString(authority, ListOrder.encode(order)).commit()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Kept by Agendula, as the provider's lists table has no order of its own. */
|
|
||||||
override fun reorderLists(listIds: List<Long>) {
|
|
||||||
val authority = authority()
|
|
||||||
synchronized(listOrderLock) {
|
|
||||||
storeListOrder(authority, ListOrder.reordered(taskLists().map { it.id }, listIds))
|
|
||||||
}
|
|
||||||
// Wakes the observers on the lists without asking any sync adapter to upload: nothing changed in the provider.
|
|
||||||
runCatching { resolver.notifyChange(TasksContract.listsUri(authority), null, 0) }
|
|
||||||
}
|
|
||||||
|
|
||||||
private val listOrderLock = Any()
|
|
||||||
|
|
||||||
override fun tasks(query: TaskQuery): List<Task> {
|
override fun tasks(query: TaskQuery): List<Task> {
|
||||||
val clauses = mutableListOf<String>()
|
val clauses = mutableListOf<String>()
|
||||||
@@ -111,22 +73,14 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun task(taskId: Long): Task? {
|
override fun task(taskId: Long): Task? {
|
||||||
roundLegacyAnchors()
|
val rows = queryInstances("${Instances.TASK_ID} = ?", arrayOf(taskId.toString()))
|
||||||
val rows = instanceRows(resolver.query(TasksContract.instancesUri(authority()), null, "${Instances.TASK_ID} = ?", arrayOf(taskId.toString()), null))
|
return rows.firstOrNull { it.distanceFromCurrent == 0 } ?: rows.firstOrNull()
|
||||||
return (rows.firstOrNull { it.task.distanceFromCurrent == 0 } ?: rows.firstOrNull())?.let { enrich(listOf(it)).single() }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun task(taskId: Long, occurrenceStart: Instant?): Task? {
|
override fun task(taskId: Long, occurrenceStart: Instant?): Task? {
|
||||||
if (occurrenceStart == null) return task(taskId)
|
if (occurrenceStart == null) return task(taskId)
|
||||||
roundLegacyAnchors()
|
val rows = queryInstances("${Instances.TASK_ID} = ?", arrayOf(taskId.toString()))
|
||||||
val rows = instanceRows(queryOccurrences(taskId))
|
return rows.firstOrNull { it.occurrenceStart == occurrenceStart } ?: task(taskId)
|
||||||
val chosen = rows.firstOrNull { it.anchor == occurrenceStart }
|
|
||||||
?: rows.firstOrNull { it.anchor?.let { a -> sameSecond(a, occurrenceStart) } == true }
|
|
||||||
if (chosen != null) return enrich(listOf(chosen)).single()
|
|
||||||
tickedCopy(taskId, occurrenceStart)?.let { copy -> return task(copy)?.copy(occurrenceStart = occurrenceStart) }
|
|
||||||
// A plain task has one occurrence, whatever it was addressed by. A series
|
|
||||||
// answers null rather than another occurrence a write would then land on.
|
|
||||||
return if (seriesRules(listOf(taskId)).isEmpty()) task(taskId) else null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun subtasks(parentTaskId: Long): List<Task> =
|
override fun subtasks(parentTaskId: Long): List<Task> =
|
||||||
@@ -137,73 +91,39 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
* the window still counts. All columns and a lenient `_deleted`, as in
|
* the window still counts. All columns and a lenient `_deleted`, as in
|
||||||
* [exportTasks], since the table's shape varies across providers.
|
* [exportTasks], since the table's shape varies across providers.
|
||||||
*/
|
*/
|
||||||
override fun subtaskIds(parentTaskId: Long): List<Long> =
|
override fun subtaskIds(parentTaskId: Long): List<Long> = resolver.query(
|
||||||
childRows(authority(), parentTaskId, projection = null) { it.getLong(Tasks.ID) }
|
TasksContract.tasksUri(authority()),
|
||||||
|
null,
|
||||||
|
"${Tasks.PARENT_ID} = ? AND (${Tasks.DELETED} IS NULL OR ${Tasks.DELETED} = 0)",
|
||||||
|
arrayOf(parentTaskId.toString()),
|
||||||
|
null,
|
||||||
|
)?.use { c ->
|
||||||
|
val r = CursorColumnReader(c)
|
||||||
|
buildList {
|
||||||
|
while (c.moveToNext()) {
|
||||||
|
if (r.getLong(Tasks.ORIGINAL_INSTANCE_ID) != null) continue
|
||||||
|
r.getLong(Tasks.ID)?.takeIf { it != parentTaskId }?.let(::add)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} ?: emptyList()
|
||||||
|
|
||||||
/**
|
|
||||||
* All columns and no sort: the instances view differs across provider
|
|
||||||
* versions (tasks.org's has no `is_recurring`), the by-name mapper nulls what
|
|
||||||
* is missing, and the repository re-sorts.
|
|
||||||
*/
|
|
||||||
private fun queryInstances(selection: String?, args: Array<String>?): List<Task> {
|
private fun queryInstances(selection: String?, args: Array<String>?): List<Task> {
|
||||||
roundLegacyAnchors()
|
val uri = TasksContract.instancesUri(authority())
|
||||||
return instanceTasks(resolver.query(TasksContract.instancesUri(authority()), null, selection, args, null))
|
// projection = null (all columns): the instances view differs across
|
||||||
}
|
// provider versions (e.g. tasks.org's bundled OpenTasks has no
|
||||||
|
// `is_recurring` / `distance_from_current`). The by-name mapper reads
|
||||||
/** Maps [cursor]'s instance rows, with the rule each series keeps on its `tasks` row, and their tags. */
|
// whatever is present and nulls the rest; the repository re-sorts, so we
|
||||||
private fun instanceTasks(cursor: Cursor?): List<Task> = enrich(instanceRows(cursor))
|
// don't depend on a provider sort column either.
|
||||||
|
val tasks = resolver.query(uri, null, selection, args, null)
|
||||||
/** [cursor]'s instance rows, before their rules and tags are looked up. */
|
?.use { c ->
|
||||||
private fun instanceRows(cursor: Cursor?): List<InstanceRow> {
|
|
||||||
var flagged = false
|
|
||||||
val rows = cursor?.use { c ->
|
|
||||||
flagged = c.getColumnIndex(Instances.IS_RECURRING) >= 0
|
|
||||||
val reader = CursorColumnReader(c)
|
val reader = CursorColumnReader(c)
|
||||||
buildList { while (c.moveToNext()) add(TaskMapper.instance(reader)) }
|
buildList { while (c.moveToNext()) add(TaskMapper.task(reader)) }
|
||||||
}.orEmpty()
|
} ?: emptyList()
|
||||||
// Where the provider flags recurrence, only flagged rows need their rule looked up.
|
if (tasks.isEmpty()) return tasks
|
||||||
return if (flagged) rows.map { if (it.task.isRecurring) it else it.copy(ruleOwner = NO_RULE) } else rows
|
|
||||||
}
|
|
||||||
|
|
||||||
/** [rows] completed with the rule each series keeps on its `tasks` row, and their tags. */
|
|
||||||
private fun enrich(rows: List<InstanceRow>): List<Task> {
|
|
||||||
if (rows.isEmpty()) return emptyList()
|
|
||||||
val rules = seriesRules(rows.map { it.ruleOwner }.filter { it != NO_RULE })
|
|
||||||
val tasks = rows.map { TaskMapper.withRule(it, rules[it.ruleOwner]) }
|
|
||||||
val tags = categories(tasks.map { it.taskId })
|
val tags = categories(tasks.map { it.taskId })
|
||||||
return tasks.map { task -> tags[task.taskId]?.let { task.copy(tags = it) } ?: task }
|
return tasks.map { task -> tags[task.taskId]?.let { task.copy(tags = it) } ?: task }
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The recurrence of each of [taskIds] that is a series, keyed by task id. */
|
|
||||||
private fun seriesRules(taskIds: Collection<Long>): Map<Long, SeriesRule> = queryByIds(
|
|
||||||
TasksContract.tasksUri(authority()),
|
|
||||||
arrayOf(Tasks.ID, Tasks.RRULE, Tasks.RDATE),
|
|
||||||
Tasks.ID,
|
|
||||||
taskIds,
|
|
||||||
filter = "${Tasks.RRULE} IS NOT NULL OR ${Tasks.RDATE} IS NOT NULL",
|
|
||||||
) { r -> r.getLong(Tasks.ID)?.let { id -> TaskMapper.seriesRule(r)?.let { id to it } } }.toMap()
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Rows of [uri] whose [idColumn] is one of [ids], in chunks that stay under
|
|
||||||
* SQLite's bound-argument limit, each mapped by [read] (null rows dropped).
|
|
||||||
* A null [projection] reads all columns, for tables whose shape varies.
|
|
||||||
*/
|
|
||||||
private fun <T : Any> queryByIds(
|
|
||||||
uri: Uri,
|
|
||||||
projection: Array<String>?,
|
|
||||||
idColumn: String,
|
|
||||||
ids: Collection<Long>,
|
|
||||||
filter: String? = null,
|
|
||||||
filterArgs: List<String> = emptyList(),
|
|
||||||
sortOrder: String? = null,
|
|
||||||
read: (ColumnReader) -> T?,
|
|
||||||
): List<T> = inSelections(idColumn, ids, filter, filterArgs).flatMap { (selection, args) ->
|
|
||||||
resolver.query(uri, projection, selection, args, sortOrder)?.use { c ->
|
|
||||||
val reader = CursorColumnReader(c)
|
|
||||||
buildList { while (c.moveToNext()) read(reader)?.let(::add) }
|
|
||||||
} ?: emptyList()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun exportTasks(listId: Long): List<ExportTask> {
|
override fun exportTasks(listId: Long): List<ExportTask> {
|
||||||
// projection = null for the same reason queryInstances uses it: the tasks
|
// projection = null for the same reason queryInstances uses it: the tasks
|
||||||
// table's shape varies across provider versions, and the by-name mapper
|
// table's shape varies across provider versions, and the by-name mapper
|
||||||
@@ -274,7 +194,7 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun updateSeries(seriesId: Long, occurrenceStart: Instant, form: TaskForm, reminders: List<TaskReminder>?) {
|
override fun updateSeries(seriesId: Long, occurrenceStart: Instant, form: TaskForm, reminders: List<TaskReminder>?) {
|
||||||
val occurrence = occurrence(seriesId, occurrenceStart) { TaskMapper.instance(it).task } ?: task(seriesId)
|
val occurrence = task(seriesId, occurrenceStart)
|
||||||
val anchors = resolver.query(
|
val anchors = resolver.query(
|
||||||
taskUri(authority(), seriesId), arrayOf(Tasks.DTSTART, Tasks.DUE), null, null, null,
|
taskUri(authority(), seriesId), arrayOf(Tasks.DTSTART, Tasks.DUE), null, null, null,
|
||||||
)?.use { c ->
|
)?.use { c ->
|
||||||
@@ -282,14 +202,14 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
val r = CursorColumnReader(c)
|
val r = CursorColumnReader(c)
|
||||||
r.getLong(Tasks.DTSTART) to r.getLong(Tasks.DUE)
|
r.getLong(Tasks.DTSTART) to r.getLong(Tasks.DUE)
|
||||||
}
|
}
|
||||||
val base = TaskWriteMapper.seriesValues(form, ZoneId.systemDefault().id)
|
fun shifted(anchor: Long?, was: Instant?, now: Instant?): Long? = when {
|
||||||
// Without an anchor to shift, the form's own value stands — already pinned for an all-day series.
|
now == null -> null
|
||||||
fun shifted(column: String, anchor: Long?, was: Instant?, now: Instant?): Any? =
|
anchor == null || was == null -> now.toEpochMilliseconds()
|
||||||
if (now == null || anchor == null || was == null) base[column]
|
else -> anchor + (now - was).inWholeMilliseconds
|
||||||
else providerMillis(anchor + (now - was).inWholeMilliseconds)
|
}
|
||||||
val values = base +
|
val values = TaskWriteMapper.seriesValues(form, ZoneId.systemDefault().id) +
|
||||||
(Tasks.DTSTART to shifted(Tasks.DTSTART, anchors?.first, occurrence?.start, form.start)) +
|
(Tasks.DTSTART to shifted(anchors?.first, occurrence?.start, form.start)) +
|
||||||
(Tasks.DUE to shifted(Tasks.DUE, anchors?.second, occurrence?.due, form.due))
|
(Tasks.DUE to shifted(anchors?.second, occurrence?.due, form.due))
|
||||||
val rows = resolver.update(taskUri(authority(), seriesId), values.toContentValues(), null, null)
|
val rows = resolver.update(taskUri(authority(), seriesId), values.toContentValues(), null, null)
|
||||||
if (rows == 0) throw TaskWriteFailedException("update series $seriesId")
|
if (rows == 0) throw TaskWriteFailedException("update series $seriesId")
|
||||||
setCategories(seriesId, form.tags)
|
setCategories(seriesId, form.tags)
|
||||||
@@ -330,7 +250,17 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
arrayOf(Tasks.RRULE, Tasks.RDATE, Tasks.EXDATE, Tasks.DTSTART, Tasks.DUE, Tasks.IS_ALLDAY, Tasks.TZ),
|
arrayOf(Tasks.RRULE, Tasks.RDATE, Tasks.EXDATE, Tasks.DTSTART, Tasks.DUE, Tasks.IS_ALLDAY, Tasks.TZ),
|
||||||
null, null, null,
|
null, null, null,
|
||||||
)?.use { c ->
|
)?.use { c ->
|
||||||
if (c.moveToFirst()) TaskMapper.seriesSpec(CursorColumnReader(c)) else null
|
if (!c.moveToFirst()) return@use null
|
||||||
|
val r = CursorColumnReader(c)
|
||||||
|
val anchor = r.getLong(Tasks.DTSTART) ?: r.getLong(Tasks.DUE) ?: return@use null
|
||||||
|
RecurrenceSpec(
|
||||||
|
rrule = r.getString(Tasks.RRULE)?.ifBlank { null },
|
||||||
|
rdate = r.getString(Tasks.RDATE),
|
||||||
|
exdate = r.getString(Tasks.EXDATE),
|
||||||
|
anchor = Instant.fromEpochMilliseconds(anchor),
|
||||||
|
isAllDay = r.getBoolean(Tasks.IS_ALLDAY),
|
||||||
|
timeZone = r.getString(Tasks.TZ),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** End the master's rule before [occurrenceStart], and drop the exceptions past it. */
|
/** End the master's rule before [occurrenceStart], and drop the exceptions past it. */
|
||||||
@@ -360,7 +290,7 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
buildList {
|
buildList {
|
||||||
while (c.moveToNext()) {
|
while (c.moveToNext()) {
|
||||||
val original = r.getLong(Tasks.ORIGINAL_INSTANCE_TIME) ?: continue
|
val original = r.getLong(Tasks.ORIGINAL_INSTANCE_TIME) ?: continue
|
||||||
if (providerMillis(original) >= providerMillis(from.toEpochMilliseconds())) r.getLong(Tasks.ID)?.let(::add)
|
if (original >= from.toEpochMilliseconds()) r.getLong(Tasks.ID)?.let(::add)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} ?: emptyList()
|
} ?: emptyList()
|
||||||
@@ -372,10 +302,7 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun updateInstance(taskId: Long, occurrenceStart: Instant, form: TaskForm, reminders: List<TaskReminder>?) {
|
override fun updateInstance(taskId: Long, occurrenceStart: Instant, form: TaskForm, reminders: List<TaskReminder>?) {
|
||||||
val hit = instanceFor(taskId, occurrenceStart)
|
if (reminders == null) return writeInstance(taskId, occurrenceStart, form)
|
||||||
?: throw TaskWriteFailedException("update instance $taskId@$occurrenceStart: no such occurrence")
|
|
||||||
hit.overrideId?.let { return updateOverride(it, form, reminders) }
|
|
||||||
if (reminders == null) return writeInstance(taskId, hit.instanceId, form)
|
|
||||||
// ⚠️ Written to the series, and then put back. Forking an occurrence
|
// ⚠️ Written to the series, and then put back. Forking an occurrence
|
||||||
// copies the task's *current* properties onto the new override row, so
|
// copies the task's *current* properties onto the new override row, so
|
||||||
// setting the alarm beforehand is the only way to carry it across — and
|
// setting the alarm beforehand is the only way to carry it across — and
|
||||||
@@ -384,26 +311,15 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
val seriesReminders = alarmRows(taskId).map { it.second }
|
val seriesReminders = alarmRows(taskId).map { it.second }
|
||||||
writeReminders(taskId, reminders)
|
writeReminders(taskId, reminders)
|
||||||
try {
|
try {
|
||||||
writeInstance(taskId, hit.instanceId, form)
|
writeInstance(taskId, occurrenceStart, form)
|
||||||
} finally {
|
} finally {
|
||||||
setReminders(taskId, seriesReminders)
|
setReminders(taskId, seriesReminders)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
private fun writeInstance(taskId: Long, occurrenceStart: Instant, form: TaskForm) {
|
||||||
* An occurrence that already has its own row is written there directly. The
|
val instanceId = instanceIdFor(taskId, occurrenceStart)
|
||||||
* fork-and-restore dance in [updateInstance] would put its old tags and
|
?: throw TaskWriteFailedException("update instance $taskId@$occurrenceStart: no such occurrence")
|
||||||
* reminders back over the new ones.
|
|
||||||
*/
|
|
||||||
private fun updateOverride(overrideId: Long, form: TaskForm, reminders: List<TaskReminder>?) {
|
|
||||||
val values = TaskWriteMapper.instanceValues(form, ZoneId.systemDefault().id)
|
|
||||||
val rows = resolver.update(taskUri(authority(), overrideId), values.toContentValues(), null, null)
|
|
||||||
if (rows == 0) throw TaskWriteFailedException("update override $overrideId")
|
|
||||||
setCategories(overrideId, form.tags)
|
|
||||||
writeReminders(overrideId, reminders)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun writeInstance(taskId: Long, instanceId: Long, form: TaskForm) {
|
|
||||||
val values = TaskWriteMapper.instanceValues(form, ZoneId.systemDefault().id)
|
val values = TaskWriteMapper.instanceValues(form, ZoneId.systemDefault().id)
|
||||||
val uri = TasksContract.instanceUri(authority(), instanceId)
|
val uri = TasksContract.instanceUri(authority(), instanceId)
|
||||||
// The fork copies the series' properties onto the override, so the tags
|
// The fork copies the series' properties onto the override, so the tags
|
||||||
@@ -430,147 +346,28 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** An occurrence's instance row, and the override row behind it if it has one. */
|
|
||||||
private class InstanceHit(val instanceId: Long, val overrideId: Long?)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The provider's instance row for one occurrence.
|
* The provider's instance row id for one occurrence.
|
||||||
*
|
*
|
||||||
* The seam addresses occurrences by `(taskId, occurrenceStart)`; writing
|
* The seam addresses occurrences by `(taskId, occurrenceStart)`; writing
|
||||||
* through the instances URI still needs the row id, so it is looked up here
|
* through the instances URI still needs the row id, so it is looked up here
|
||||||
* rather than carried around above the data layer.
|
* rather than carried around above the data layer. Selection is on `task_id`
|
||||||
|
* only — the anchor is matched in Kotlin because the column that holds it
|
||||||
|
* (`instance_original_time`) is missing on older provider schemas, where a
|
||||||
|
* WHERE clause naming it would throw instead of falling back.
|
||||||
*/
|
*/
|
||||||
private fun instanceFor(taskId: Long, occurrenceStart: Instant): InstanceHit? {
|
private fun instanceIdFor(taskId: Long, occurrenceStart: Instant): Long? {
|
||||||
roundLegacyAnchors()
|
val uri = TasksContract.instancesUri(authority())
|
||||||
return occurrence(taskId, occurrenceStart) { r ->
|
val selection = "${Instances.TASK_ID} = ?"
|
||||||
r.getLong(Tasks.ID)?.let { id ->
|
return resolver.query(uri, null, selection, arrayOf(taskId.toString()), null)?.use { c ->
|
||||||
InstanceHit(id, r.getLong(Instances.TASK_ID)?.takeIf { r.getLong(Tasks.ORIGINAL_INSTANCE_ID) != null })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun instanceIdFor(taskId: Long, occurrenceStart: Instant): Long? = instanceFor(taskId, occurrenceStart)?.instanceId
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [read] applied to the instance row of [taskId]'s occurrence at
|
|
||||||
* [occurrenceStart] — its own, or an override's that replaced it — matched in
|
|
||||||
* whole seconds, as the provider expands them. The anchor is matched in
|
|
||||||
* Kotlin because `instance_original_time` is missing on older schemas.
|
|
||||||
*/
|
|
||||||
private fun <T> occurrence(taskId: Long, occurrenceStart: Instant, read: (ColumnReader) -> T): T? =
|
|
||||||
queryOccurrences(taskId)?.use { c ->
|
|
||||||
val reader = CursorColumnReader(c)
|
val reader = CursorColumnReader(c)
|
||||||
// An exact match first: a row of the same second is a fallback, not a peer.
|
|
||||||
var near: Int? = null
|
|
||||||
while (c.moveToNext()) {
|
while (c.moveToNext()) {
|
||||||
val anchor = TaskMapper.occurrenceAnchor(reader) ?: continue
|
if (TaskMapper.occurrenceAnchor(reader) == occurrenceStart) {
|
||||||
if (anchor == occurrenceStart) return@use read(reader)
|
return@use reader.getLong(Tasks.ID)
|
||||||
if (near == null && sameSecond(anchor, occurrenceStart)) near = c.position
|
|
||||||
}
|
|
||||||
near?.let { c.moveToPosition(it); read(reader) }
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instance rows of [taskId] and of the overrides standing in for its
|
|
||||||
* occurrences. A provider whose view lacks `original_instance_id` gets the
|
|
||||||
* task's own rows only, rather than a failed query.
|
|
||||||
*/
|
|
||||||
private fun queryOccurrences(taskId: Long): Cursor? {
|
|
||||||
val authority = authority()
|
|
||||||
val uri = TasksContract.instancesUri(authority)
|
|
||||||
val id = taskId.toString()
|
|
||||||
if (ownRowsOnlyFor != authority) {
|
|
||||||
try {
|
|
||||||
return resolver.query(uri, null, OCCURRENCE_OF, arrayOf(id, id), null)
|
|
||||||
} catch (e: SQLiteException) {
|
|
||||||
rememberIfMissingColumn(authority, e)
|
|
||||||
} catch (e: IllegalArgumentException) {
|
|
||||||
rememberIfMissingColumn(authority, e)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return resolver.query(uri, null, "${Instances.TASK_ID} = ?", arrayOf(id), null)
|
null
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Only a view without the column is remembered; any other failure falls back for this query alone. */
|
|
||||||
private fun rememberIfMissingColumn(authority: String, e: Exception) {
|
|
||||||
val message = e.message.orEmpty()
|
|
||||||
if (Tasks.ORIGINAL_INSTANCE_ID in message || "no such column" in message || "Invalid column" in message) {
|
|
||||||
ownRowsOnlyFor = authority
|
|
||||||
} else {
|
|
||||||
Log.w(TAG, "Occurrence query failed, reading the task's own rows", e)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The provider whose instances view turned out to lack `original_instance_id`. */
|
|
||||||
@Volatile
|
|
||||||
private var ownRowsOnlyFor: String? = null
|
|
||||||
|
|
||||||
@Volatile
|
|
||||||
private var anchorsRoundedFor: String? = null
|
|
||||||
|
|
||||||
private val roundingLock = Any()
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Rounds the DTSTART/DUE a build before [providerMillis] stored with
|
|
||||||
* milliseconds, which the provider cannot move past a completed occurrence.
|
|
||||||
* Once per provider, before the first read: concurrent readers wait for it.
|
|
||||||
* Written as the rows' sync adapter, since the server only ever had whole
|
|
||||||
* seconds, so nothing is dirtied or re-uploaded. Overrides need nothing: the
|
|
||||||
* provider forks them at its own whole-second instance times.
|
|
||||||
*
|
|
||||||
* Never fails a read. A row the provider refuses is left as it was and tried
|
|
||||||
* again on the next start; only a pass that rounded everything is remembered.
|
|
||||||
*/
|
|
||||||
private fun roundLegacyAnchors() {
|
|
||||||
val authority = authority()
|
|
||||||
if (anchorsRoundedFor == authority) return
|
|
||||||
synchronized(roundingLock) {
|
|
||||||
if (anchorsRoundedFor == authority) return
|
|
||||||
val prefs = context.getSharedPreferences(MIGRATIONS, Context.MODE_PRIVATE)
|
|
||||||
val key = "anchors_rounded:$authority"
|
|
||||||
val done = prefs.getBoolean(key, false) || runCatching { roundAll(authority) }
|
|
||||||
.onFailure { Log.w(TAG, "Rounding legacy anchors failed", it) }
|
|
||||||
.getOrDefault(false)
|
|
||||||
if (done) prefs.edit().putBoolean(key, true).apply()
|
|
||||||
anchorsRoundedFor = authority
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** True when every stale row was rounded. */
|
|
||||||
private fun roundAll(authority: String): Boolean {
|
|
||||||
val columns = listOf(Tasks.DTSTART, Tasks.DUE)
|
|
||||||
val ops = resolver.query(
|
|
||||||
TasksContract.tasksUri(authority),
|
|
||||||
arrayOf(Tasks.ID, Tasks.ACCOUNT_NAME, Tasks.ACCOUNT_TYPE) + columns,
|
|
||||||
// Only series: the provider moves nothing else, so nothing else needs rounding.
|
|
||||||
"(${columns.joinToString(" OR ") { "$it % 1000 != 0" }}) AND (${Tasks.RRULE} IS NOT NULL OR ${Tasks.RDATE} IS NOT NULL)",
|
|
||||||
null,
|
|
||||||
null,
|
|
||||||
)?.use { c ->
|
|
||||||
val r = CursorColumnReader(c)
|
|
||||||
buildList<ContentProviderOperation> {
|
|
||||||
while (c.moveToNext()) {
|
|
||||||
val id = r.getLong(Tasks.ID) ?: continue
|
|
||||||
val values = buildMap<String, Any?> {
|
|
||||||
for (column in columns) {
|
|
||||||
val millis = r.getLong(column) ?: continue
|
|
||||||
if (providerMillis(millis) != millis) put(column, providerMillis(millis))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val name = r.getString(Tasks.ACCOUNT_NAME)
|
|
||||||
val type = r.getString(Tasks.ACCOUNT_TYPE)
|
|
||||||
val uri = if (name.isNullOrEmpty() || type.isNullOrEmpty()) taskUri(authority, id)
|
|
||||||
else TasksContract.asSyncAdapter(taskUri(authority, id), name, type)
|
|
||||||
add(ContentProviderOperation.newUpdate(uri).withValues(values.toContentValues()).build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} ?: return false
|
|
||||||
if (ops.isEmpty()) return true
|
|
||||||
val batch = runCatching { resolver.applyBatch(authority, ArrayList(ops)) }.getOrNull()
|
|
||||||
if (batch != null) return batch.all { (it.count ?: 0) > 0 }
|
|
||||||
// One refused row fails the whole batch; row by row, the rest still go.
|
|
||||||
return ops.map { op -> runCatching { resolver.applyBatch(authority, arrayListOf(op)).single().count ?: 0 }.getOrDefault(0) > 0 }
|
|
||||||
.all { it }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun setReminders(taskId: Long, reminders: List<TaskReminder>) {
|
override fun setReminders(taskId: Long, reminders: List<TaskReminder>) {
|
||||||
@@ -633,19 +430,29 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Tags by task id for [taskIds], in stored order. */
|
/** Tags by task id for [taskIds], in stored order. */
|
||||||
private fun categories(taskIds: Collection<Long>): Map<Long, List<String>> = queryByIds(
|
private fun categories(taskIds: Collection<Long>): Map<Long, List<String>> {
|
||||||
|
val rows = taskIds.distinct().chunked(MAX_SQL_ARGS - 1).flatMap { chunk ->
|
||||||
|
val selection = "${Properties.MIMETYPE} = ? AND ${Properties.TASK_ID} IN (${chunk.joinToString(",") { "?" }})"
|
||||||
|
val args = (listOf(TasksContract.Category.MIMETYPE) + chunk.map(Long::toString)).toTypedArray()
|
||||||
|
resolver.query(
|
||||||
TasksContract.propertiesUri(authority()),
|
TasksContract.propertiesUri(authority()),
|
||||||
arrayOf(Properties.TASK_ID, TasksContract.Category.NAME),
|
arrayOf(Properties.TASK_ID, TasksContract.Category.NAME),
|
||||||
Properties.TASK_ID,
|
selection,
|
||||||
taskIds,
|
args,
|
||||||
filter = "${Properties.MIMETYPE} = ?",
|
Properties.PROPERTY_ID,
|
||||||
filterArgs = listOf(TasksContract.Category.MIMETYPE),
|
)?.use { c ->
|
||||||
sortOrder = Properties.PROPERTY_ID,
|
val reader = CursorColumnReader(c)
|
||||||
) { r ->
|
buildList {
|
||||||
val id = r.getLong(Properties.TASK_ID)
|
while (c.moveToNext()) {
|
||||||
val name = r.getString(TasksContract.Category.NAME)
|
val id = reader.getLong(Properties.TASK_ID) ?: continue
|
||||||
if (id == null || name == null) null else id to name
|
val name = reader.getString(TasksContract.Category.NAME) ?: continue
|
||||||
}.groupBy({ it.first }, { it.second }).mapValues { normalizeTags(it.value) }
|
add(id to name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} ?: emptyList()
|
||||||
|
}
|
||||||
|
return rows.groupBy({ it.first }, { it.second }).mapValues { normalizeTags(it.value) }
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Replaces [taskId]'s category rows in one batch, so a refused insert cannot
|
* Replaces [taskId]'s category rows in one batch, so a refused insert cannot
|
||||||
@@ -675,21 +482,16 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun setCancelled(taskId: Long, cancelled: Boolean) {
|
override fun setCancelled(taskId: Long, cancelled: Boolean) {
|
||||||
if (!cancelled && movedBack(taskId, null)) return
|
|
||||||
val rows = resolver.update(taskUri(authority(), taskId), cancelValues(cancelled).toContentValues(), null, null)
|
val rows = resolver.update(taskUri(authority(), taskId), cancelValues(cancelled).toContentValues(), null, null)
|
||||||
if (rows == 0) throw TaskWriteFailedException("cancel task $taskId")
|
if (rows == 0) throw TaskWriteFailedException("cancel task $taskId")
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Through the instances URI, like [setCompletedInstance]. */
|
/** Through the instances URI, like [setCompletedInstance]. */
|
||||||
override fun setCancelledInstance(taskId: Long, occurrenceStart: Instant, cancelled: Boolean) {
|
override fun setCancelledInstance(taskId: Long, occurrenceStart: Instant, cancelled: Boolean) {
|
||||||
if (!cancelled && movedBack(taskId, occurrenceStart)) return
|
|
||||||
val instanceId = instanceIdFor(taskId, occurrenceStart)
|
val instanceId = instanceIdFor(taskId, occurrenceStart)
|
||||||
?: return tickedCopy(taskId, occurrenceStart)?.let { setCancelled(it, cancelled) }
|
?: return setCancelled(taskId, cancelled)
|
||||||
?: plainUnlessSeries(taskId, occurrenceStart) { setCancelled(taskId, cancelled) }
|
|
||||||
val uri = TasksContract.instanceUri(authority(), instanceId)
|
val uri = TasksContract.instanceUri(authority(), instanceId)
|
||||||
val rows = rememberingCopy(taskId, occurrenceStart, closing = cancelled) {
|
val rows = resolver.update(uri, cancelValues(cancelled).toContentValues(), null, null)
|
||||||
resolver.update(uri, cancelValues(cancelled).toContentValues(), null, null)
|
|
||||||
}
|
|
||||||
if (rows == 0) throw TaskWriteFailedException("cancel instance $instanceId")
|
if (rows == 0) throw TaskWriteFailedException("cancel instance $instanceId")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -699,7 +501,6 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
)
|
)
|
||||||
|
|
||||||
override fun setCompleted(taskId: Long, completed: Boolean) {
|
override fun setCompleted(taskId: Long, completed: Boolean) {
|
||||||
if (!completed && movedBack(taskId, null)) return
|
|
||||||
val values = TaskWriteMapper.completionValues(completed, System.currentTimeMillis())
|
val values = TaskWriteMapper.completionValues(completed, System.currentTimeMillis())
|
||||||
val rows = resolver.update(taskUri(authority(), taskId), values.toContentValues(), null, null)
|
val rows = resolver.update(taskUri(authority(), taskId), values.toContentValues(), null, null)
|
||||||
if (rows == 0) throw TaskWriteFailedException("complete task $taskId")
|
if (rows == 0) throw TaskWriteFailedException("complete task $taskId")
|
||||||
@@ -707,382 +508,22 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Through the instances URI, which is what makes the provider fork an override
|
* Through the instances URI, which is what makes the provider fork an override
|
||||||
* rather than close the series. No instance row for the anchor on a task that
|
* rather than close the series. No instance row for the anchor means the task
|
||||||
* is not a series means the plain write is the right one.
|
* is not a series after all — the plain write is then the right one.
|
||||||
*/
|
*/
|
||||||
override fun setCompletedInstance(taskId: Long, occurrenceStart: Instant, completed: Boolean) {
|
override fun setCompletedInstance(taskId: Long, occurrenceStart: Instant, completed: Boolean) {
|
||||||
if (!completed && movedBack(taskId, occurrenceStart)) return
|
|
||||||
val instanceId = instanceIdFor(taskId, occurrenceStart)
|
val instanceId = instanceIdFor(taskId, occurrenceStart)
|
||||||
?: return tickedCopy(taskId, occurrenceStart)?.let { setCompleted(it, completed) }
|
?: return setCompleted(taskId, completed)
|
||||||
?: plainUnlessSeries(taskId, occurrenceStart) { setCompleted(taskId, completed) }
|
|
||||||
val values = TaskWriteMapper.completionValues(completed, System.currentTimeMillis())
|
val values = TaskWriteMapper.completionValues(completed, System.currentTimeMillis())
|
||||||
val uri = TasksContract.instanceUri(authority(), instanceId)
|
val uri = TasksContract.instanceUri(authority(), instanceId)
|
||||||
val rows = rememberingCopy(taskId, occurrenceStart, closing = completed) {
|
val rows = resolver.update(uri, values.toContentValues(), null, null)
|
||||||
resolver.update(uri, values.toContentValues(), null, null)
|
|
||||||
}
|
|
||||||
if (rows == 0) throw TaskWriteFailedException("complete instance $instanceId")
|
if (rows == 0) throw TaskWriteFailedException("complete instance $instanceId")
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Runs [write], and when it closed an occurrence the provider then detached
|
|
||||||
* into a task of its own, remembers that copy, so the occurrence can still be
|
|
||||||
* read and reopened, and how the series moved, so reopening can move it back.
|
|
||||||
* When the series moved on, its sub-tasks start over for the next occurrence
|
|
||||||
* (#160). With a copy, [resets] remembers how they were, so unticking gives
|
|
||||||
* that back; without one there is no tick to undo, and the reset stays.
|
|
||||||
*/
|
|
||||||
private fun rememberingCopy(taskId: Long, occurrenceStart: Instant, closing: Boolean, write: () -> Int): Int {
|
|
||||||
if (!closing) return write()
|
|
||||||
val authority = authority()
|
|
||||||
val lastId = runCatching { lastTaskId(authority) }.getOrNull() ?: return write()
|
|
||||||
val series = runCatching { readSeries(authority, taskId) }.getOrNull()
|
|
||||||
val before = series?.state
|
|
||||||
return write().also { rows ->
|
|
||||||
if (rows > 0) {
|
|
||||||
val after = before?.let {
|
|
||||||
runCatching { readSeries(authority, taskId)?.state }
|
|
||||||
.onFailure { Log.w(TAG, "Reading the series after the tick failed", it) }
|
|
||||||
.getOrNull()?.takeIf { it != before }
|
|
||||||
}
|
|
||||||
val copy = runCatching { detachedSince(authority, lastId) }
|
|
||||||
.onFailure { Log.w(TAG, "Looking up the detached copy failed", it) }
|
|
||||||
.getOrNull()
|
|
||||||
if (series != null && before != null && after != null && SubtaskReset.movedOn(before, after)) {
|
|
||||||
runCatching { resetSubtasks(authority, taskId, series, before, after, record = copy != null) }
|
|
||||||
.onFailure { Log.w(TAG, "Resetting the sub-tasks failed", it) }
|
|
||||||
}
|
|
||||||
if (copy != null) {
|
|
||||||
runCatching {
|
|
||||||
val parentUid = series?.parentId?.let { uidOf(authority, it) }
|
|
||||||
parentUid?.let { markCopy(authority, copy, it) }
|
|
||||||
val tick = Tick(
|
|
||||||
copy, taskId.takeIf { after != null }, before.takeIf { after != null }, after, System.currentTimeMillis(),
|
|
||||||
parentUid = parentUid,
|
|
||||||
)
|
|
||||||
ticks.put(ticks.key(authority, taskId, occurrenceStart), tick)
|
|
||||||
}.onFailure { Log.w(TAG, "Recording the tick failed", it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Marks [copyId], left by ticking a recurring sub-task, with the UID of the
|
|
||||||
* parent it sits under, where DAVx5 keeps and uploads unknown properties, so
|
|
||||||
* other installs know it too.
|
|
||||||
*/
|
|
||||||
private fun markCopy(authority: String, copyId: Long, parentUid: String) {
|
|
||||||
val values = mapOf(
|
|
||||||
Properties.TASK_ID to copyId,
|
|
||||||
Properties.MIMETYPE to SubtaskReset.UNKNOWN_PROPERTY_MIMETYPE,
|
|
||||||
Properties.DATA0 to SubtaskReset.copyMarkerJson(parentUid),
|
|
||||||
)
|
|
||||||
runCatching { resolver.insert(TasksContract.propertiesUri(authority), values.toContentValues()) }
|
|
||||||
.onFailure { Log.w(TAG, "Marking the ticked copy failed", it) }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun uidOf(authority: String, taskId: Long): String? =
|
|
||||||
resolver.query(taskUri(authority, taskId), null, null, null, null)
|
|
||||||
?.use { c -> if (c.moveToFirst()) CursorColumnReader(c).getString(Tasks.UID) else null }
|
|
||||||
|
|
||||||
/** The parent UID each of [taskIds] carries a copy marker for. */
|
|
||||||
private fun markerParents(authority: String, taskIds: Collection<Long>): Map<Long, String> = runCatching {
|
|
||||||
queryByIds(
|
|
||||||
TasksContract.propertiesUri(authority),
|
|
||||||
arrayOf(Properties.TASK_ID, Properties.DATA0),
|
|
||||||
Properties.TASK_ID,
|
|
||||||
taskIds,
|
|
||||||
filter = "${Properties.MIMETYPE} = ?",
|
|
||||||
filterArgs = listOf(SubtaskReset.UNKNOWN_PROPERTY_MIMETYPE),
|
|
||||||
) { r ->
|
|
||||||
val id = r.getLong(Properties.TASK_ID) ?: return@queryByIds null
|
|
||||||
SubtaskReset.markerParentFromJson(r.getString(Properties.DATA0))?.let { id to it }
|
|
||||||
}.toMap()
|
|
||||||
}.onFailure { Log.w(TAG, "Reading the copy markers failed", it) }.getOrDefault(emptyMap())
|
|
||||||
|
|
||||||
/** One `tasks` row as a reset reads it. */
|
|
||||||
private class SubtaskRow(
|
|
||||||
val id: Long,
|
|
||||||
val parentId: Long?,
|
|
||||||
val isOverride: Boolean,
|
|
||||||
val rrule: String?,
|
|
||||||
val rdate: String?,
|
|
||||||
val state: SubtaskState,
|
|
||||||
val dates: SubtaskDates,
|
|
||||||
val isAllDay: Boolean,
|
|
||||||
val lastModified: Long?,
|
|
||||||
val uid: String?,
|
|
||||||
)
|
|
||||||
|
|
||||||
private fun subtaskRow(r: ColumnReader): SubtaskRow? = r.getLong(Tasks.ID)?.let { id ->
|
|
||||||
SubtaskRow(
|
|
||||||
id = id,
|
|
||||||
parentId = r.getLong(Tasks.PARENT_ID),
|
|
||||||
isOverride = r.getLong(Tasks.ORIGINAL_INSTANCE_ID) != null,
|
|
||||||
rrule = r.getString(Tasks.RRULE),
|
|
||||||
rdate = r.getString(Tasks.RDATE),
|
|
||||||
state = subtaskState(r),
|
|
||||||
dates = SubtaskDates(r.getLong(Tasks.DTSTART), r.getLong(Tasks.DUE)),
|
|
||||||
isAllDay = r.getBoolean(Tasks.IS_ALLDAY),
|
|
||||||
lastModified = r.getLong(Tasks.LAST_MODIFIED),
|
|
||||||
uid = r.getString(Tasks.UID),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resets what [SubtaskReset] picks under [seriesId], dated ones moved as the
|
|
||||||
* series moved from [before] to [after], and with [record] keeps it in
|
|
||||||
* [resets] first, under the anchor the series moved to. The series' list is
|
|
||||||
* read once and walked in memory, with the sub-tasks filed in other lists
|
|
||||||
* found by parent, one chunked query per level of the routine's tree.
|
|
||||||
*/
|
|
||||||
private fun resetSubtasks(
|
|
||||||
authority: String,
|
|
||||||
seriesId: Long,
|
|
||||||
series: SeriesRead,
|
|
||||||
before: Map<String, Any?>,
|
|
||||||
after: Map<String, Any?>,
|
|
||||||
record: Boolean,
|
|
||||||
) {
|
|
||||||
val listId = series.listId ?: return
|
|
||||||
val projection = SUBTASK_COLUMNS.filter { it in series.columns }.toTypedArray()
|
|
||||||
if (Tasks.ID !in projection || Tasks.PARENT_ID !in projection) return
|
|
||||||
val listRows = resolver.query(
|
|
||||||
TasksContract.tasksUri(authority),
|
|
||||||
projection,
|
|
||||||
"${Tasks.LIST_ID} = ? AND (${Tasks.DELETED} IS NULL OR ${Tasks.DELETED} = 0)",
|
|
||||||
arrayOf(listId.toString()),
|
|
||||||
null,
|
|
||||||
)?.use { c ->
|
|
||||||
val r = CursorColumnReader(c)
|
|
||||||
buildList { while (c.moveToNext()) subtaskRow(r)?.let(::add) }
|
|
||||||
}.orEmpty()
|
|
||||||
val rows = SubtaskReset.mergeSubtree(seriesId, listRows.filter { !it.isOverride }, { it.id }, { it.parentId }) { parents ->
|
|
||||||
queryByIds(
|
|
||||||
TasksContract.tasksUri(authority), projection, Tasks.PARENT_ID, parents,
|
|
||||||
filter = "${Tasks.LIST_ID} != ? AND (${Tasks.DELETED} IS NULL OR ${Tasks.DELETED} = 0)",
|
|
||||||
filterArgs = listOf(listId.toString()),
|
|
||||||
) { r -> subtaskRow(r)?.takeUnless { it.isOverride } }
|
|
||||||
}
|
|
||||||
val byId = rows.associateBy { it.id }
|
|
||||||
val children = rows.filter { !it.isOverride && it.parentId != null }.groupBy { it.parentId }
|
|
||||||
val known = knownCopies(authority, byId.keys)
|
|
||||||
val markers = markerParents(authority, children.values.flatten().map { it.id })
|
|
||||||
val uidOf = { id: Long -> if (id == seriesId) series.uid else byId[id]?.uid }
|
|
||||||
val from = SubtaskReset.anchor(before)
|
|
||||||
val to = SubtaskReset.anchor(after)
|
|
||||||
val reset = SubtaskReset.toReset(
|
|
||||||
seriesId,
|
|
||||||
SubtaskReset.shiftOf(before, after),
|
|
||||||
since = if (from != null && to != null) SubtaskReset.cycleStart(from, to) else null,
|
|
||||||
) { id ->
|
|
||||||
children[id].orEmpty().filter { it.id != id }.map {
|
|
||||||
SubtaskNode(
|
|
||||||
it.id,
|
|
||||||
SubtaskReset.recursOrCopy(it.rrule, it.rdate, known[it.id], markers[it.id], uidOf(id)),
|
|
||||||
it.state, it.dates, it.isAllDay, it.lastModified,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (reset.isEmpty()) return
|
|
||||||
if (record && to != null) resets.put(authority, seriesId, to, SubtaskReset.encode(reset), System.currentTimeMillis())
|
|
||||||
val ops = reset.map { subtaskOp(authority, it.id, SubtaskState.FRESH, it.dates.takeIf { d -> d != it.priorDates }) }
|
|
||||||
resolver.applyBatch(authority, ArrayList(ops))
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The copies this install knows of, the ones whose rows are gone forgotten; [present] are rows known to exist. */
|
|
||||||
private fun knownCopies(authority: String, present: Set<Long>): Map<Long, String> {
|
|
||||||
val copies = ticks.copies(authority)
|
|
||||||
val elsewhere = copies.keys - present
|
|
||||||
if (elsewhere.isEmpty()) return copies
|
|
||||||
val existing = queryByIds(
|
|
||||||
TasksContract.tasksUri(authority), arrayOf(Tasks.ID), Tasks.ID, elsewhere,
|
|
||||||
filter = "${Tasks.DELETED} IS NULL OR ${Tasks.DELETED} = 0",
|
|
||||||
) { it.getLong(Tasks.ID) }.toSet()
|
|
||||||
val gone = elsewhere - existing
|
|
||||||
ticks.forget(authority, gone)
|
|
||||||
return copies - gone
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun subtaskState(r: ColumnReader) =
|
|
||||||
SubtaskState(statusFromInt(r.getInt(Tasks.STATUS)), r.getInt(Tasks.PERCENT_COMPLETE), r.getLong(Tasks.COMPLETED))
|
|
||||||
|
|
||||||
/** [state] and [dates] onto sub-task [id], each only where non-null. */
|
|
||||||
private fun subtaskOp(authority: String, id: Long, state: SubtaskState?, dates: SubtaskDates?): ContentProviderOperation {
|
|
||||||
val values = buildMap<String, Any?> {
|
|
||||||
if (state != null) {
|
|
||||||
put(Tasks.STATUS, state.status.toInt())
|
|
||||||
put(Tasks.PERCENT_COMPLETE, state.percent)
|
|
||||||
put(Tasks.COMPLETED, state.completedAt)
|
|
||||||
}
|
|
||||||
if (dates != null) {
|
|
||||||
put(Tasks.DTSTART, dates.start)
|
|
||||||
put(Tasks.DUE, dates.due)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ContentProviderOperation.newUpdate(taskUri(authority, id)).withValues(values.toContentValues()).build()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** What [SubtaskReset.toRestore] gives back to the sub-tasks of [reset]. */
|
|
||||||
private fun subtaskRestore(authority: String, reset: String): List<ContentProviderOperation> {
|
|
||||||
val entries = SubtaskReset.decode(reset)
|
|
||||||
if (entries.isEmpty()) return emptyList()
|
|
||||||
val current = queryByIds(
|
|
||||||
TasksContract.tasksUri(authority),
|
|
||||||
null,
|
|
||||||
Tasks.ID,
|
|
||||||
entries.map { it.id },
|
|
||||||
filter = "${Tasks.DELETED} IS NULL OR ${Tasks.DELETED} = 0",
|
|
||||||
) { r -> subtaskRow(r)?.let { it.id to SubtaskNow(it.state, it.dates, it.isAllDay) } }.toMap()
|
|
||||||
val outcome = SubtaskReset.toRestore(entries, current::get)
|
|
||||||
if (outcome.changed.isNotEmpty()) Log.i(TAG, "Sub-tasks ${outcome.changed} changed since the reset and keep that")
|
|
||||||
return outcome.restore.map { subtaskOp(authority, it.id, it.state, it.dates) }
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Walks [parentId]'s direct sub-task rows, overrides left out, with [read] on each. */
|
|
||||||
private fun <T : Any> childRows(authority: String, parentId: Long, projection: Array<String>?, read: (ColumnReader) -> T?): List<T> =
|
|
||||||
resolver.query(
|
|
||||||
TasksContract.tasksUri(authority),
|
|
||||||
projection,
|
|
||||||
"${Tasks.PARENT_ID} = ? AND (${Tasks.DELETED} IS NULL OR ${Tasks.DELETED} = 0)",
|
|
||||||
arrayOf(parentId.toString()),
|
|
||||||
null,
|
|
||||||
)?.use { c ->
|
|
||||||
val r = CursorColumnReader(c)
|
|
||||||
buildList {
|
|
||||||
while (c.moveToNext()) {
|
|
||||||
if (r.getLong(Tasks.ORIGINAL_INSTANCE_ID) != null || r.getLong(Tasks.ID) == parentId) continue
|
|
||||||
read(r)?.let(::add)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} ?: emptyList()
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Undoes the tick that left [taskId]'s occurrence at [occurrenceStart] — or,
|
|
||||||
* with no occurrence, the tick that left the copy [taskId]: the series goes
|
|
||||||
* back where it was and the copy goes, as long as the series is still where
|
|
||||||
* the tick moved it and the copy has nothing filed under it. The sub-tasks
|
|
||||||
* the tick reset get back what [resets] kept. False when it cannot, so the
|
|
||||||
* caller reopens the copy as a task of its own.
|
|
||||||
*/
|
|
||||||
private fun movedBack(taskId: Long, occurrenceStart: Instant?): Boolean = runCatching {
|
|
||||||
val authority = authority()
|
|
||||||
val (key, tick) = occurrenceStart?.let { at -> ticks.key(authority, taskId, at).let { k -> ticks.get(k)?.let { k to it } } }
|
|
||||||
?: ticks.forCopy(authority, taskId)
|
|
||||||
?: return false
|
|
||||||
val series = tick.seriesId ?: return false
|
|
||||||
val before = tick.before ?: return false
|
|
||||||
val after = tick.after ?: return false
|
|
||||||
// Compared on what the tick recorded: one from before IS_ALLDAY and TZ were read has neither.
|
|
||||||
val now = readSeries(authority, series)?.state ?: return false
|
|
||||||
if (after.any { (column, value) -> now[column] != value } || subtaskIds(tick.copyId).isNotEmpty()) return false
|
|
||||||
val restore = before.filter { (column, value) -> after[column] != value }
|
|
||||||
val ops = arrayListOf(
|
|
||||||
ContentProviderOperation.newUpdate(taskUri(authority, series)).withValues(restore.toContentValues()).build(),
|
|
||||||
ContentProviderOperation.newDelete(taskUri(authority, tick.copyId)).build(),
|
|
||||||
)
|
|
||||||
val anchor = SubtaskReset.anchor(after)
|
|
||||||
val record = anchor?.let { resets.get(authority, series, it) }
|
|
||||||
val subtasks = record?.let {
|
|
||||||
runCatching { subtaskRestore(authority, it) }.onFailure { e -> Log.w(TAG, "Reading the reset sub-tasks failed", e) }.getOrNull()
|
|
||||||
}
|
|
||||||
subtasks?.let(ops::addAll)
|
|
||||||
resolver.applyBatch(authority, ops)
|
|
||||||
ticks.remove(key)
|
|
||||||
// Kept when the sub-tasks could not be read, rather than lost with nothing restored.
|
|
||||||
if (anchor != null && subtasks != null) resets.remove(authority, series, anchor)
|
|
||||||
true
|
|
||||||
}.onFailure { Log.w(TAG, "Moving the series back failed", it) }.getOrDefault(false)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A series row as a tick reads it: [state], the columns a tick changes and
|
|
||||||
* an undo changes back, null when the row does not recur; where it sits;
|
|
||||||
* and which columns the provider's `tasks` table has.
|
|
||||||
*/
|
|
||||||
private class SeriesRead(
|
|
||||||
val state: Map<String, Any?>?,
|
|
||||||
val listId: Long?,
|
|
||||||
val parentId: Long?,
|
|
||||||
val uid: String?,
|
|
||||||
val columns: Set<String>,
|
|
||||||
)
|
|
||||||
|
|
||||||
/** All columns, so a provider without one of [SERIES_STATE]'s still answers; the missing ones are left out. */
|
|
||||||
private fun readSeries(authority: String, taskId: Long): SeriesRead? =
|
|
||||||
resolver.query(taskUri(authority, taskId), null, null, null, null)?.use { c ->
|
|
||||||
if (!c.moveToFirst()) return@use null
|
|
||||||
val r = CursorColumnReader(c)
|
|
||||||
val state = SERIES_STATE.mapNotNull { column ->
|
|
||||||
val i = c.getColumnIndex(column)
|
|
||||||
if (i < 0) return@mapNotNull null
|
|
||||||
column to when (c.getType(i)) {
|
|
||||||
Cursor.FIELD_TYPE_NULL -> null
|
|
||||||
Cursor.FIELD_TYPE_INTEGER -> c.getLong(i)
|
|
||||||
else -> c.getString(i)
|
|
||||||
}
|
|
||||||
}.toMap()
|
|
||||||
SeriesRead(
|
|
||||||
state = state.takeIf { listOf(Tasks.RRULE, Tasks.RDATE).any { !(state[it] as? String).isNullOrBlank() } },
|
|
||||||
listId = r.getLong(Tasks.LIST_ID),
|
|
||||||
parentId = r.getLong(Tasks.PARENT_ID),
|
|
||||||
uid = r.getString(Tasks.UID),
|
|
||||||
columns = c.columnNames.toSet(),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun lastTaskId(authority: String): Long =
|
|
||||||
resolver.query(TasksContract.tasksUri(authority), arrayOf(Tasks.ID), null, null, "${Tasks.ID} DESC")
|
|
||||||
?.use { c -> if (c.moveToFirst()) c.getLong(0) else 0L } ?: 0L
|
|
||||||
|
|
||||||
/** The one plain task the provider created after [afterId], or null when it was not exactly one. */
|
|
||||||
private fun detachedSince(authority: String, afterId: Long): Long? =
|
|
||||||
resolver.query(TasksContract.tasksUri(authority), null, "${Tasks.ID} > ?", arrayOf(afterId.toString()), null)
|
|
||||||
?.use { c ->
|
|
||||||
val r = CursorColumnReader(c)
|
|
||||||
buildList {
|
|
||||||
while (c.moveToNext()) {
|
|
||||||
val plain = r.getString(Tasks.RRULE) == null && r.getString(Tasks.RDATE) == null &&
|
|
||||||
r.getLong(Tasks.ORIGINAL_INSTANCE_ID) == null
|
|
||||||
if (plain) r.getLong(Tasks.ID)?.let(::add)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}?.singleOrNull()
|
|
||||||
|
|
||||||
private val ticks = TickedCopies(
|
|
||||||
prefs = { context.getSharedPreferences(TICKED_COPIES, Context.MODE_PRIVATE) },
|
|
||||||
known = { context.getSharedPreferences(KNOWN_COPIES, Context.MODE_PRIVATE) },
|
|
||||||
)
|
|
||||||
|
|
||||||
private val resets = TickResets { context.getSharedPreferences(TICK_RESETS, Context.MODE_PRIVATE) }
|
|
||||||
|
|
||||||
/** The copy a tick left for [taskId]'s occurrence at [occurrenceStart], if one was remembered. */
|
|
||||||
private fun tickedCopy(taskId: Long, occurrenceStart: Instant): Long? =
|
|
||||||
ticks.get(ticks.key(authority(), taskId, occurrenceStart))?.copyId
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [write] for a task that turned out not to be a series. A series whose
|
|
||||||
* occurrence was not found fails instead: the plain write would close all of it.
|
|
||||||
*/
|
|
||||||
private fun plainUnlessSeries(taskId: Long, occurrenceStart: Instant, write: () -> Unit) {
|
|
||||||
if (seriesRules(listOf(taskId)).isNotEmpty()) {
|
|
||||||
throw TaskWriteFailedException("instance $taskId@$occurrenceStart: no such occurrence")
|
|
||||||
}
|
|
||||||
write()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun deleteTask(taskId: Long) {
|
override fun deleteTask(taskId: Long) {
|
||||||
resolver.delete(taskUri(authority(), taskId), null, null)
|
resolver.delete(taskUri(authority(), taskId), null, null)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Through its instance, which the provider turns into an EXDATE on the master,
|
|
||||||
* as the Room store does. Deleting the row alone leaves the master without one.
|
|
||||||
*/
|
|
||||||
override fun deleteOverride(taskId: Long, occurrenceStart: Instant) {
|
|
||||||
val instanceId = instanceIdFor(taskId, occurrenceStart) ?: return deleteTask(taskId)
|
|
||||||
resolver.delete(TasksContract.instanceUri(authority(), instanceId), null, null)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun createLocalList(name: String, color: Int): Long {
|
override fun createLocalList(name: String, color: Int): Long {
|
||||||
val uri = TasksContract.asSyncAdapter(
|
val uri = TasksContract.asSyncAdapter(
|
||||||
TasksContract.listsUri(authority()),
|
TasksContract.listsUri(authority()),
|
||||||
@@ -1153,41 +594,5 @@ class AndroidTasksDataSource @Inject constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private const val LIST_ORDER = "provider_list_order"
|
/** SQLite's default bound-argument limit on older Android releases. */
|
||||||
|
private const val MAX_SQL_ARGS = 999
|
||||||
/** An instance row of the task, or of an override standing in for one of its occurrences. */
|
|
||||||
private const val OCCURRENCE_OF = "${Instances.TASK_ID} = ? OR ${Tasks.ORIGINAL_INSTANCE_ID} = ?"
|
|
||||||
|
|
||||||
private const val MIGRATIONS = "provider_migrations"
|
|
||||||
|
|
||||||
private const val TICKED_COPIES = "provider_ticked_copies"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Every recurring sub-task's copy a tick on this install left, with the parent
|
|
||||||
* it sits under, kept past [TickedCopies.HORIZON_MS] alongside the marker on the row.
|
|
||||||
*/
|
|
||||||
private const val KNOWN_COPIES = "provider_known_copy_parents"
|
|
||||||
|
|
||||||
/** The sub-tasks each tick reset, kept apart from its copy. */
|
|
||||||
private const val TICK_RESETS = "provider_tick_resets"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* What resetting a sub-task reads: where it sits, whether it recurs, its
|
|
||||||
* progress and its dates. Only the ones the provider's table has are asked for.
|
|
||||||
*/
|
|
||||||
private val SUBTASK_COLUMNS = listOf(
|
|
||||||
Tasks.ID, Tasks.PARENT_ID, Tasks.ORIGINAL_INSTANCE_ID, Tasks.RRULE, Tasks.RDATE, Tasks.STATUS, Tasks.PERCENT_COMPLETE,
|
|
||||||
Tasks.COMPLETED, Tasks.LAST_MODIFIED, Tasks.DTSTART, Tasks.DUE, Tasks.IS_ALLDAY, Tasks.UID,
|
|
||||||
)
|
|
||||||
|
|
||||||
/** What a tick changes on a series, and an undo changes back; with what its rule is read in. */
|
|
||||||
private val SERIES_STATE = arrayOf(
|
|
||||||
Tasks.DTSTART, Tasks.DUE, Tasks.DURATION, Tasks.RRULE, Tasks.RDATE, Tasks.EXDATE,
|
|
||||||
Tasks.STATUS, Tasks.COMPLETED, Tasks.PERCENT_COMPLETE, Tasks.IS_ALLDAY, Tasks.TZ,
|
|
||||||
)
|
|
||||||
|
|
||||||
private const val TAG = "AndroidTasksDataSource"
|
|
||||||
|
|
||||||
/** No rule to look up: the provider says the row does not recur. */
|
|
||||||
private const val NO_RULE = -1L
|
|
||||||
|
|
||||||
@@ -3,9 +3,9 @@ package de.jeanlucmakiola.agendula.data.tasks
|
|||||||
import android.database.Cursor
|
import android.database.Cursor
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Domain-shaped seam over a row of provider data, read from a [Cursor] by
|
* Domain-shaped seam over a row of provider data, so the mappers can be
|
||||||
* [CursorColumnReader] or from a Map by [MapColumnReader], which also lets the
|
* unit-tested with a Map instead of a real [Cursor] (see MapColumnReader in
|
||||||
* mappers be unit-tested without a cursor. Mirrors Calendula's ColumnReader.
|
* test sources). Mirrors Calendula's ColumnReader.
|
||||||
*/
|
*/
|
||||||
interface ColumnReader {
|
interface ColumnReader {
|
||||||
fun getLong(name: String): Long?
|
fun getLong(name: String): Long?
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.tasks
|
|
||||||
|
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskList
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Agendula's own order for an external provider's lists, which the provider has
|
|
||||||
* no column for. Stored as `id=position` pairs. A list without one counts as
|
|
||||||
* position 0, as a new list does in Agendula's own store.
|
|
||||||
*/
|
|
||||||
object ListOrder {
|
|
||||||
|
|
||||||
fun decode(raw: String?): Map<Long, Int> = raw.orEmpty().split(',').mapNotNull { pair ->
|
|
||||||
val (id, position) = pair.split('=').takeIf { it.size == 2 } ?: return@mapNotNull null
|
|
||||||
id.toLongOrNull()?.let { key -> position.toIntOrNull()?.let { key to it } }
|
|
||||||
}.toMap()
|
|
||||||
|
|
||||||
fun encode(order: Map<Long, Int>): String = order.entries.joinToString(",") { "${it.key}=${it.value}" }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Positions for every list in [shown] — the lists in their current order —
|
|
||||||
* after one account's [listIds] were rearranged: those take each other's
|
|
||||||
* slots in their new order, and every other list keeps its own.
|
|
||||||
*/
|
|
||||||
fun reordered(shown: List<Long>, listIds: List<Long>): Map<Long, Int> {
|
|
||||||
val moved = listIds.iterator()
|
|
||||||
val moving = listIds.toSet()
|
|
||||||
val result = shown.map { if (it in moving && moved.hasNext()) moved.next() else it }.toMutableList()
|
|
||||||
moved.forEachRemaining { if (it !in result) result += it }
|
|
||||||
return result.withIndex().associate { it.value to it.index }
|
|
||||||
}
|
|
||||||
|
|
||||||
fun sorted(lists: List<TaskList>, order: Map<Long, Int>): List<TaskList> = lists.sortedWith(
|
|
||||||
compareBy<TaskList>({ it.accountName.lowercase() }, { order[it.id] ?: 0 }, { it.name.lowercase() })
|
|
||||||
.thenBy { it.name },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
+3
-10
@@ -67,7 +67,6 @@ class ModeRoutingTasksDataSource(
|
|||||||
active().setCancelledInstance(taskId, occurrenceStart, cancelled)
|
active().setCancelledInstance(taskId, occurrenceStart, cancelled)
|
||||||
|
|
||||||
override fun deleteTask(taskId: Long) = active().deleteTask(taskId)
|
override fun deleteTask(taskId: Long) = active().deleteTask(taskId)
|
||||||
override fun deleteOverride(taskId: Long, occurrenceStart: Instant) = active().deleteOverride(taskId, occurrenceStart)
|
|
||||||
override fun createLocalList(name: String, color: Int): Long = active().createLocalList(name, color)
|
override fun createLocalList(name: String, color: Int): Long = active().createLocalList(name, color)
|
||||||
override fun updateList(listId: Long, name: String, color: Int) = active().updateList(listId, name, color)
|
override fun updateList(listId: Long, name: String, color: Int) = active().updateList(listId, name, color)
|
||||||
override fun deleteList(listId: Long) = active().deleteList(listId)
|
override fun deleteList(listId: Long) = active().deleteList(listId)
|
||||||
@@ -82,22 +81,16 @@ class ModeRoutingTasksDataSource(
|
|||||||
* So the registration moves with the mode, and the switch itself counts as a
|
* So the registration moves with the mode, and the switch itself counts as a
|
||||||
* change: the data underneath every live flow has just been replaced.
|
* change: the data underneath every live flow has just been replaced.
|
||||||
*/
|
*/
|
||||||
override fun registerObserver(onChange: () -> Unit): AutoCloseable =
|
override fun registerObserver(onChange: () -> Unit): AutoCloseable {
|
||||||
follow(onChange) { it.registerObserver(onChange) }
|
|
||||||
|
|
||||||
override fun registerTaskObserver(onChange: () -> Unit): AutoCloseable =
|
|
||||||
follow(onChange) { it.registerTaskObserver(onChange) }
|
|
||||||
|
|
||||||
private fun follow(onChange: () -> Unit, register: (TasksDataSource) -> AutoCloseable): AutoCloseable {
|
|
||||||
val lock = Any()
|
val lock = Any()
|
||||||
var closed = false
|
var closed = false
|
||||||
var handle: AutoCloseable? = runCatching { register(active()) }.getOrNull()
|
var handle: AutoCloseable? = runCatching { active().registerObserver(onChange) }.getOrNull()
|
||||||
|
|
||||||
val modeHandle = resolver.onModeChanged {
|
val modeHandle = resolver.onModeChanged {
|
||||||
synchronized(lock) {
|
synchronized(lock) {
|
||||||
if (!closed) {
|
if (!closed) {
|
||||||
handle?.let { runCatching { it.close() } }
|
handle?.let { runCatching { it.close() } }
|
||||||
handle = runCatching { register(active()) }.getOrNull()
|
handle = runCatching { active().registerObserver(onChange) }.getOrNull()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
onChange()
|
onChange()
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.tasks
|
|
||||||
|
|
||||||
/** SQLite's default bound-argument limit on older Android releases. */
|
|
||||||
internal const val MAX_SQL_ARGS = 999
|
|
||||||
|
|
||||||
/**
|
|
||||||
* `idColumn IN (…)` selections over [ids], each with its arguments and
|
|
||||||
* [filterArgs] after them, in chunks that keep every query within [limit]
|
|
||||||
* bound arguments.
|
|
||||||
*/
|
|
||||||
internal fun inSelections(
|
|
||||||
idColumn: String,
|
|
||||||
ids: Collection<Long>,
|
|
||||||
filter: String? = null,
|
|
||||||
filterArgs: List<String> = emptyList(),
|
|
||||||
limit: Int = MAX_SQL_ARGS,
|
|
||||||
): List<Pair<String, Array<String>>> = ids.distinct().chunked(limit - filterArgs.size).map { chunk ->
|
|
||||||
val selection = buildString {
|
|
||||||
append("$idColumn IN (${chunk.joinToString(",") { "?" }})")
|
|
||||||
if (filter != null) append(" AND ($filter)")
|
|
||||||
}
|
|
||||||
selection to (chunk.map(Long::toString) + filterArgs).toTypedArray()
|
|
||||||
}
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.tasks
|
|
||||||
|
|
||||||
import kotlinx.coroutines.CoroutineScope
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.FlowPreview
|
|
||||||
import kotlinx.coroutines.channels.Channel
|
|
||||||
import kotlinx.coroutines.flow.debounce
|
|
||||||
import kotlinx.coroutines.flow.receiveAsFlow
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Runs [action] once per burst of store changes: [register] hooks the store's
|
|
||||||
* observer, and [request] asks for a pass without one. Started at most once.
|
|
||||||
*/
|
|
||||||
class StoreChangeDebouncer(
|
|
||||||
private val scope: CoroutineScope,
|
|
||||||
private val delayMillis: Long,
|
|
||||||
private val register: (onChange: () -> Unit) -> AutoCloseable,
|
|
||||||
private val action: suspend () -> Unit,
|
|
||||||
) {
|
|
||||||
private val requests = Channel<Unit>(Channel.CONFLATED)
|
|
||||||
private val started = AtomicBoolean(false)
|
|
||||||
|
|
||||||
/** @return whether this call started it; false when it already was. */
|
|
||||||
@OptIn(FlowPreview::class)
|
|
||||||
fun start(): Boolean {
|
|
||||||
if (!started.compareAndSet(false, true)) return false
|
|
||||||
runCatching { register { requests.trySend(Unit) } }
|
|
||||||
scope.launch(Dispatchers.IO) {
|
|
||||||
requests.receiveAsFlow().debounce(delayMillis).collect { runCatching { action() } }
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
fun request() {
|
|
||||||
requests.trySend(Unit)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,7 +5,6 @@ import de.jeanlucmakiola.agendula.data.reminders.ReminderPlanner
|
|||||||
import de.jeanlucmakiola.agendula.domain.Task
|
import de.jeanlucmakiola.agendula.domain.Task
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskForm
|
import de.jeanlucmakiola.agendula.domain.TaskForm
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskReminder
|
import de.jeanlucmakiola.agendula.domain.TaskReminder
|
||||||
import de.jeanlucmakiola.agendula.domain.calendarDate
|
|
||||||
import java.time.ZoneId
|
import java.time.ZoneId
|
||||||
import kotlin.time.Instant
|
import kotlin.time.Instant
|
||||||
|
|
||||||
@@ -23,8 +22,7 @@ internal object StoredReminders {
|
|||||||
*
|
*
|
||||||
* A task getting its first date takes the defaults only when the form
|
* A task getting its first date takes the defaults only when the form
|
||||||
* names no reminder; one that already had a date takes those of the new
|
* names no reminder; one that already had a date takes those of the new
|
||||||
* date that no reminder of the form counts from, and those of a date
|
* date that no reminder of the form counts from. Otherwise the form is
|
||||||
* whose defaults had all rung when it moved — see [revived]. Otherwise the form is
|
|
||||||
* kept, so an edit that clears every reminder means "use the default
|
* kept, so an edit that clears every reminder means "use the default
|
||||||
* here" as before.
|
* here" as before.
|
||||||
*
|
*
|
||||||
@@ -35,7 +33,7 @@ internal object StoredReminders {
|
|||||||
fun of(form: TaskForm, current: Task?, settings: Settings, now: Long, zone: ZoneId): List<TaskReminder> {
|
fun of(form: TaskForm, current: Task?, settings: Settings, now: Long, zone: ZoneId): List<TaskReminder> {
|
||||||
val wanted = form.reminders.map { it.lead }.distinct()
|
val wanted = form.reminders.map { it.lead }.distinct()
|
||||||
if (form.remindersChosen) return wanted
|
if (form.remindersChosen) return wanted
|
||||||
return withDefaults(form, current?.start, current?.due, current?.isAllDay ?: form.isAllDay, settings, now, zone)
|
return withDefaults(form, current?.start, current?.due, settings, now, zone)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** [of] for a task whose dates were [start] and [due], whatever the form chose. */
|
/** [of] for a task whose dates were [start] and [due], whatever the form chose. */
|
||||||
@@ -43,35 +41,17 @@ internal object StoredReminders {
|
|||||||
form: TaskForm,
|
form: TaskForm,
|
||||||
start: Instant?,
|
start: Instant?,
|
||||||
due: Instant?,
|
due: Instant?,
|
||||||
wasAllDay: Boolean,
|
|
||||||
settings: Settings,
|
settings: Settings,
|
||||||
now: Long,
|
now: Long,
|
||||||
zone: ZoneId,
|
zone: ZoneId,
|
||||||
): List<TaskReminder> {
|
): List<TaskReminder> {
|
||||||
val wanted = form.reminders.map { it.lead }.distinct()
|
val wanted = form.reminders.map { it.lead }.distinct()
|
||||||
val fresh = freshAnchors(form, start, due, wasAllDay, settings, now, zone)
|
val had = anchorsOf(start, due)
|
||||||
if (fresh.isEmpty()) return wanted
|
val gained = anchorsOf(form.start, form.due) - had
|
||||||
if (anchorsOf(start, due).isEmpty() || wanted.isEmpty()) return wanted.ifEmpty { defaultsFor(form, settings, now, zone) }
|
if (gained.isEmpty()) return wanted
|
||||||
|
if (had.isEmpty() || wanted.isEmpty()) return wanted.ifEmpty { defaultsFor(form, settings, now, zone) }
|
||||||
val named = wanted.map { it.fromStart }.toSet()
|
val named = wanted.map { it.fromStart }.toSet()
|
||||||
return wanted + defaultsFor(form, settings, now, zone).filter { it.fromStart in fresh && it.fromStart !in named }
|
return wanted + defaultsFor(form, settings, now, zone).filter { it.fromStart in gained && it.fromStart !in named }
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The dates whose defaults [withDefaults] brings in, as [TaskReminder.fromStart]:
|
|
||||||
* those the task gains, and those [revived]. Empty = the defaults play no part.
|
|
||||||
*/
|
|
||||||
fun freshAnchors(
|
|
||||||
form: TaskForm,
|
|
||||||
start: Instant?,
|
|
||||||
due: Instant?,
|
|
||||||
wasAllDay: Boolean,
|
|
||||||
settings: Settings,
|
|
||||||
now: Long,
|
|
||||||
zone: ZoneId,
|
|
||||||
): Set<Boolean> {
|
|
||||||
val wanted = form.reminders.map { it.lead }.distinct()
|
|
||||||
val gained = anchorsOf(form.start, form.due) - anchorsOf(start, due)
|
|
||||||
return gained + revived(form, start, due, wasAllDay, wanted, settings, now, zone)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -88,53 +68,15 @@ internal object StoredReminders {
|
|||||||
zone: ZoneId,
|
zone: ZoneId,
|
||||||
): List<TaskReminder> {
|
): List<TaskReminder> {
|
||||||
if (reminders.isEmpty()) return reminders
|
if (reminders.isEmpty()) return reminders
|
||||||
return keptAcrossSwitch(reminders, form, settings) ?: defaultsFor(form, settings, now, zone)
|
if (reminders.toSet() == settings.defaultRemindersFor(form.listId, !form.isAllDay).toSet()) {
|
||||||
|
return defaultsFor(form, settings, now, zone)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** What [switched] keeps of [reminders], or null when it swaps in the new kind's defaults. */
|
|
||||||
fun keptAcrossSwitch(reminders: List<TaskReminder>, form: TaskForm, settings: Settings): List<TaskReminder>? {
|
|
||||||
if (reminders.toSet() == settings.defaultRemindersFor(form.listId, !form.isAllDay).toSet()) return null
|
|
||||||
val kept = if (form.isAllDay) {
|
val kept = if (form.isAllDay) {
|
||||||
reminders.map { it.inWholeDays() }
|
reminders.map { it.inWholeDays() }
|
||||||
} else {
|
} else {
|
||||||
reminders.filter { it.allDay.minuteOfDay == null }
|
reminders.filter { it.allDay.minuteOfDay == null }
|
||||||
}
|
}
|
||||||
return kept.distinct().ifEmpty { null }
|
return kept.distinct().ifEmpty { defaultsFor(form, settings, now, zone) }
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The dates of a one-off task that moved after every default of theirs
|
|
||||||
* had rung: a task saved then was left without them as past (#121), so
|
|
||||||
* the new date brings them like a date the task gains. Only on a task
|
|
||||||
* with reminders of its own and none from that date — no reminders at
|
|
||||||
* all is the planner's default or turned off, and either holds.
|
|
||||||
*/
|
|
||||||
private fun revived(
|
|
||||||
form: TaskForm,
|
|
||||||
start: Instant?,
|
|
||||||
due: Instant?,
|
|
||||||
wasAllDay: Boolean,
|
|
||||||
wanted: List<TaskReminder>,
|
|
||||||
settings: Settings,
|
|
||||||
now: Long,
|
|
||||||
zone: ZoneId,
|
|
||||||
): Set<Boolean> {
|
|
||||||
if (form.rrule != null || wanted.isEmpty()) return emptySet()
|
|
||||||
val named = wanted.map { it.fromStart }.toSet()
|
|
||||||
val defaults = settings.defaultRemindersFor(form.listId, wasAllDay)
|
|
||||||
fun revived(fromStart: Boolean, was: Instant?, isNow: Instant?): Boolean {
|
|
||||||
if (was == null || isNow == null || fromStart in named) return false
|
|
||||||
val moved = if (wasAllDay == form.isAllDay) {
|
|
||||||
isNow != was
|
|
||||||
} else {
|
|
||||||
isNow.calendarDate(form.isAllDay, zone) != was.calendarDate(wasAllDay, zone)
|
|
||||||
}
|
|
||||||
val leads = defaults.filter { it.fromStart == fromStart }
|
|
||||||
return moved && leads.isNotEmpty() && leads.all {
|
|
||||||
ReminderPlanner.triggerAt(was, wasAllDay, it.minutesBefore, settings.allDayReminderMinuteOfDay, zone) < now
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return setOfNotNull(true.takeIf { revived(true, start, form.start) }, false.takeIf { revived(false, due, form.due) })
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The dates a reminder can count from, as [TaskReminder.fromStart]. */
|
/** The dates a reminder can count from, as [TaskReminder.fromStart]. */
|
||||||
|
|||||||
@@ -1,295 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.tasks
|
|
||||||
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TasksContract.Tasks
|
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskStatus
|
|
||||||
import de.jeanlucmakiola.agendula.domain.isClosed
|
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.ExpansionWindow
|
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceExpander
|
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceSpec
|
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.dateZone
|
|
||||||
import de.jeanlucmakiola.agendula.domain.statusFromInt
|
|
||||||
import java.time.Duration
|
|
||||||
import java.time.LocalDateTime
|
|
||||||
import java.time.ZoneId
|
|
||||||
import java.time.temporal.ChronoUnit
|
|
||||||
import kotlin.time.Duration.Companion.days
|
|
||||||
import kotlin.time.Instant
|
|
||||||
|
|
||||||
private const val MILLIS_PER_SECOND = 1000L
|
|
||||||
private const val MILLIS_PER_DAY = 24L * 60 * 60 * 1000
|
|
||||||
|
|
||||||
/** A sub-task's progress, which a routine's next occurrence starts without. */
|
|
||||||
internal data class SubtaskState(val status: TaskStatus, val percent: Int?, val completedAt: Long?) {
|
|
||||||
/** Open with nothing done yet: what a reset leaves. */
|
|
||||||
val isFresh: Boolean get() = status == TaskStatus.NEEDS_ACTION && (percent ?: 0) == 0 && completedAt == null
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
val FRESH = SubtaskState(TaskStatus.NEEDS_ACTION, null, null)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** A sub-task's own start and due, as epoch millis. */
|
|
||||||
internal data class SubtaskDates(val start: Long?, val due: Long?) {
|
|
||||||
val isEmpty: Boolean get() = start == null && due == null
|
|
||||||
|
|
||||||
/** The same dates as a store keeps them: to the second, or for an all-day task to the day. */
|
|
||||||
fun sameAs(other: SubtaskDates, isAllDay: Boolean): Boolean {
|
|
||||||
fun unit(at: Long?) = at?.let { Math.floorDiv(it, if (isAllDay) MILLIS_PER_DAY else MILLIS_PER_SECOND) }
|
|
||||||
return unit(start) == unit(other.start) && unit(due) == unit(other.due)
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
val NONE = SubtaskDates(null, null)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A sub-task as [SubtaskReset] sees it; [recurring] also covers a copy a tick of
|
|
||||||
* a recurring one left. [lastModified] dates progress that has no completion time.
|
|
||||||
*/
|
|
||||||
internal class SubtaskNode(
|
|
||||||
val id: Long,
|
|
||||||
val recurring: Boolean,
|
|
||||||
val state: SubtaskState,
|
|
||||||
val dates: SubtaskDates = SubtaskDates.NONE,
|
|
||||||
val isAllDay: Boolean = false,
|
|
||||||
val lastModified: Long? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
/** A sub-task [SubtaskReset] reset: its state and dates before, and the dates the reset gave it. */
|
|
||||||
internal data class ResetSubtask(
|
|
||||||
val id: Long,
|
|
||||||
val prior: SubtaskState,
|
|
||||||
val priorDates: SubtaskDates = SubtaskDates.NONE,
|
|
||||||
val dates: SubtaskDates = priorDates,
|
|
||||||
)
|
|
||||||
|
|
||||||
/** A reset sub-task as it is now, for [SubtaskReset.toRestore]. */
|
|
||||||
internal class SubtaskNow(val state: SubtaskState, val dates: SubtaskDates, val isAllDay: Boolean)
|
|
||||||
|
|
||||||
/** What moving back writes to one sub-task: its [state] and its [dates], each only where non-null. */
|
|
||||||
internal data class SubtaskBack(val id: Long, val state: SubtaskState?, val dates: SubtaskDates?)
|
|
||||||
|
|
||||||
/** What moving a series back does with its reset sub-tasks, and which ones changed since and keep that. */
|
|
||||||
internal class SubtaskRestore(val restore: List<SubtaskBack>, val changed: List<Long>)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* How far a series moved in [seriesZone]. A timed sub-task moves by the series'
|
|
||||||
* wall-clock change there, so it keeps its offset to the routine across a DST
|
|
||||||
* change whatever zone it is stored in; an all-day one moves by the change of
|
|
||||||
* the series' calendar date.
|
|
||||||
*/
|
|
||||||
internal class SeriesShift(from: Long, to: Long, private val seriesZone: ZoneId) {
|
|
||||||
private val delta = Duration.between(local(from, seriesZone), local(to, seriesZone))
|
|
||||||
private val days = ChronoUnit.DAYS.between(local(from, seriesZone).toLocalDate(), local(to, seriesZone).toLocalDate())
|
|
||||||
|
|
||||||
/** [at] moved along. */
|
|
||||||
fun apply(at: Long, isAllDay: Boolean): Long {
|
|
||||||
val zone = if (isAllDay) dateZone(isAllDay = true, timeZone = null) else seriesZone
|
|
||||||
val moved = if (isAllDay) local(at, zone).plusDays(days) else local(at, zone).plus(delta)
|
|
||||||
return moved.atZone(zone).toInstant().toEpochMilli()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun local(at: Long, zone: ZoneId) = LocalDateTime.ofInstant(java.time.Instant.ofEpochMilli(at), zone)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* What a routine's sub-tasks do when its series moves on to the next occurrence
|
|
||||||
* (#160): the ones completed or in progress start over, as in tasks.org, dated
|
|
||||||
* ones move along with the routine, and moving the series back gives them their
|
|
||||||
* state and dates again.
|
|
||||||
*/
|
|
||||||
internal object SubtaskReset {
|
|
||||||
|
|
||||||
/** Only bounds the search for a next occurrence. */
|
|
||||||
private val LOOKAHEAD = (366 * 1000).days
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The `X-` property Agendula puts on the copy a provider tick of a recurring
|
|
||||||
* sub-task left, valued with the UID of the parent it sits under, so any
|
|
||||||
* device knows it for one while it stays there.
|
|
||||||
*/
|
|
||||||
const val COPY_MARKER = "X-AGENDULA-TICK-COPY"
|
|
||||||
|
|
||||||
/** The provider `properties` mimetype DAVx5 keeps unknown properties under, and round-trips. */
|
|
||||||
const val UNKNOWN_PROPERTY_MIMETYPE = "vnd.android.cursor.item/vnd.ical4android.unknown-property"
|
|
||||||
|
|
||||||
private val MARKER_JSON = Regex("""^\s*\[\s*"$COPY_MARKER"\s*,\s*"((?:[^"\\]|\\.)*)"""", RegexOption.IGNORE_CASE)
|
|
||||||
|
|
||||||
/** The marker for a copy under the parent [parentUid], as DAVx5 stores an unknown property: a JSON array of name and value. */
|
|
||||||
fun copyMarkerJson(parentUid: String): String =
|
|
||||||
"[\"$COPY_MARKER\",\"${parentUid.replace("\\", "\\\\").replace("\"", "\\\"")}\"]"
|
|
||||||
|
|
||||||
/** The parent UID an unknown-property row's JSON marks its task a copy under, or null when it is no marker. */
|
|
||||||
fun markerParentFromJson(json: String?): String? =
|
|
||||||
json?.let(MARKER_JSON::find)?.groupValues?.get(1)?.replace(Regex("""\\(.)"""), "$1")
|
|
||||||
|
|
||||||
/** The parent UID a stored residue's marker names, as a copy synced in from a provider install carries it. */
|
|
||||||
fun markerParentFromResidue(residue: String?): String? = residue?.lines()?.firstNotNullOfOrNull {
|
|
||||||
val line = it.trim()
|
|
||||||
val next = line.getOrNull(COPY_MARKER.length)
|
|
||||||
if (!line.startsWith(COPY_MARKER, ignoreCase = true) || (next != ':' && next != ';')) return@firstNotNullOfOrNull null
|
|
||||||
line.substringAfter(':').replace(Regex("""\\([\\;,])"""), "$1")
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Whether a record naming [copyParent] makes a task under [parentUid] a copy: only under the parent it came from. */
|
|
||||||
fun isCopyOf(copyParent: String?, parentUid: String?): Boolean = copyParent != null && copyParent == parentUid
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Whether a provider row under [parentUid] is left alone as recurring: it has
|
|
||||||
* a rule, or it is a copy a tick of a recurring sibling left, known by the
|
|
||||||
* parent this install recorded for it ([knownParent]) or by its marker
|
|
||||||
* ([markerParent]), either only while it sits under that parent.
|
|
||||||
*/
|
|
||||||
fun recursOrCopy(rrule: String?, rdate: String?, knownParent: String?, markerParent: String?, parentUid: String?): Boolean =
|
|
||||||
!rrule.isNullOrBlank() || !rdate.isNullOrBlank() || isCopyOf(knownParent, parentUid) || isCopyOf(markerParent, parentUid)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [rows] grown by what [fetch] finds under the ids reached from [root] so
|
|
||||||
* far, asked once per id, until nothing new turns up: the sub-tasks filed in
|
|
||||||
* other lists than the one [rows] came from.
|
|
||||||
*/
|
|
||||||
fun <R> mergeSubtree(root: Long, rows: List<R>, id: (R) -> Long, parent: (R) -> Long?, fetch: (Set<Long>) -> List<R>): List<R> {
|
|
||||||
val all = LinkedHashMap<Long, R>().apply { rows.forEach { put(id(it), it) } }
|
|
||||||
val asked = HashSet<Long>()
|
|
||||||
while (true) {
|
|
||||||
val children = all.values.groupBy(parent)
|
|
||||||
val reached = linkedSetOf(root)
|
|
||||||
val queue = ArrayDeque(listOf(root))
|
|
||||||
while (queue.isNotEmpty()) {
|
|
||||||
children[queue.removeFirst()].orEmpty().map(id).filter(reached::add).forEach(queue::addLast)
|
|
||||||
}
|
|
||||||
val toAsk = reached - asked
|
|
||||||
if (toAsk.isEmpty()) return all.values.toList()
|
|
||||||
asked += toAsk
|
|
||||||
fetch(toAsk).forEach { all.putIfAbsent(id(it), it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Where the occurrence a move closes began, for [toReset]'s `since`: one
|
|
||||||
* step of the move before its old anchor [from], [to] being the new one.
|
|
||||||
*/
|
|
||||||
fun cycleStart(from: Long, to: Long): Long = from - (to - from)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The sub-tasks under [parentId], all the way down, to reset: started ones,
|
|
||||||
* and with a [shift], dated ones too. A recurring one has a series of its
|
|
||||||
* own and is left alone with everything under it; a cancelled one stays as
|
|
||||||
* it is.
|
|
||||||
*
|
|
||||||
* With [since], a started one is only reset when it was completed, or for
|
|
||||||
* one in progress last changed, at or after it: during the cycle the move
|
|
||||||
* closes. A copy an earlier cycle left, which nothing marks as one, is left
|
|
||||||
* alone that way, and so is one with neither time to go by.
|
|
||||||
*/
|
|
||||||
fun toReset(
|
|
||||||
parentId: Long,
|
|
||||||
shift: SeriesShift? = null,
|
|
||||||
since: Long? = null,
|
|
||||||
children: (Long) -> List<SubtaskNode>,
|
|
||||||
): List<ResetSubtask> {
|
|
||||||
val seen = mutableSetOf(parentId)
|
|
||||||
val reset = mutableListOf<ResetSubtask>()
|
|
||||||
fun walk(id: Long) {
|
|
||||||
children(id).filter { !it.recurring && seen.add(it.id) }.forEach {
|
|
||||||
val started = !it.state.isFresh
|
|
||||||
val stamp = it.state.completedAt ?: it.lastModified
|
|
||||||
val earlier = started && since != null && (stamp == null || stamp < since)
|
|
||||||
val moves = shift != null && !it.dates.isEmpty
|
|
||||||
if (it.state.status != TaskStatus.CANCELLED && !earlier && (started || moves)) {
|
|
||||||
val dates = if (shift == null) it.dates else SubtaskDates(
|
|
||||||
it.dates.start?.let { at -> shift.apply(at, it.isAllDay) },
|
|
||||||
it.dates.due?.let { at -> shift.apply(at, it.isAllDay) },
|
|
||||||
)
|
|
||||||
reset += ResetSubtask(it.id, it.state, it.dates, dates)
|
|
||||||
}
|
|
||||||
walk(it.id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
walk(parentId)
|
|
||||||
return reset
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* What moving back gives each reset sub-task: its state where it is still
|
|
||||||
* fresh, and its dates where they are still the ones the reset wrote. What
|
|
||||||
* changed since keeps the user's version and is listed as changed; a
|
|
||||||
* deleted sub-task is neither.
|
|
||||||
*/
|
|
||||||
fun toRestore(reset: List<ResetSubtask>, current: (Long) -> SubtaskNow?): SubtaskRestore {
|
|
||||||
val restore = mutableListOf<SubtaskBack>()
|
|
||||||
val changed = mutableListOf<Long>()
|
|
||||||
reset.forEach { entry ->
|
|
||||||
val now = current(entry.id) ?: return@forEach
|
|
||||||
val state = entry.prior.takeIf { now.state.isFresh }
|
|
||||||
val datesMoved = entry.dates != entry.priorDates
|
|
||||||
val dates = entry.priorDates.takeIf { datesMoved && now.dates.sameAs(entry.dates, now.isAllDay) }
|
|
||||||
if (state != null || dates != null) restore += SubtaskBack(entry.id, state, dates)
|
|
||||||
if (state == null || (datesMoved && dates == null)) changed += entry.id
|
|
||||||
}
|
|
||||||
return SubtaskRestore(restore, changed)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun encode(reset: List<ResetSubtask>): String = reset.joinToString(";") {
|
|
||||||
listOf(
|
|
||||||
it.id, it.prior.status.name, it.prior.percent, it.prior.completedAt,
|
|
||||||
it.priorDates.start, it.priorDates.due, it.dates.start, it.dates.due,
|
|
||||||
).joinToString(",") { value -> value?.toString().orEmpty() }
|
|
||||||
}
|
|
||||||
|
|
||||||
fun decode(raw: String?): List<ResetSubtask> = raw.orEmpty().split(';').mapNotNull { entry ->
|
|
||||||
val parts = entry.split(',')
|
|
||||||
if (parts.size != 8) return@mapNotNull null
|
|
||||||
val id = parts[0].toLongOrNull() ?: return@mapNotNull null
|
|
||||||
val status = TaskStatus.entries.firstOrNull { it.name == parts[1] } ?: return@mapNotNull null
|
|
||||||
ResetSubtask(
|
|
||||||
id,
|
|
||||||
SubtaskState(status, parts[2].toIntOrNull(), parts[3].toLongOrNull()),
|
|
||||||
SubtaskDates(parts[4].toLongOrNull(), parts[5].toLongOrNull()),
|
|
||||||
SubtaskDates(parts[6].toLongOrNull(), parts[7].toLongOrNull()),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** A provider series' rule set from its columns. */
|
|
||||||
fun specOf(state: Map<String, Any?>): RecurrenceSpec? = TaskMapper.seriesSpec(MapColumnReader(state))
|
|
||||||
|
|
||||||
/** How the series moved from [before] to [after], read in the zone its rule is expanded in. */
|
|
||||||
fun shiftOf(before: Map<String, Any?>, after: Map<String, Any?>, floating: ZoneId = ZoneId.systemDefault()): SeriesShift? {
|
|
||||||
val from = anchor(before) ?: return null
|
|
||||||
val to = anchor(after) ?: return null
|
|
||||||
val reader = MapColumnReader(after)
|
|
||||||
return SeriesShift(from, to, dateZone(reader.getBoolean(Tasks.IS_ALLDAY), reader.getString(Tasks.TZ), floating))
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Whether a provider tick moved the series on, judged by its columns
|
|
||||||
* [before] and [after]: its start (or due) moved later and it is still open,
|
|
||||||
* with [next], its rule set as it now stands, generating an occurrence from
|
|
||||||
* there. An `EXDATE` or a status alone is no move; a series whose rule ran
|
|
||||||
* out is finished.
|
|
||||||
*/
|
|
||||||
fun movedOn(before: Map<String, Any?>?, after: Map<String, Any?>?, next: RecurrenceSpec? = after?.let(::specOf)): Boolean {
|
|
||||||
val was = anchor(before ?: return false) ?: return false
|
|
||||||
val now = anchor(after ?: return false) ?: return false
|
|
||||||
if (now <= was) return false
|
|
||||||
if (statusFromInt((after[Tasks.STATUS] as? Number)?.toInt()).isClosed) return false
|
|
||||||
val spec = next ?: return false
|
|
||||||
if (spec.rrule == null && spec.rdate == null) return false
|
|
||||||
val parts = spec.rrule?.split(';')?.map { it.trim() }?.filter { it.isNotEmpty() }
|
|
||||||
val count = parts?.firstOrNull { it.startsWith("COUNT=", ignoreCase = true) }?.substringAfter('=')?.toIntOrNull()
|
|
||||||
if (count != null && count <= 0) return false
|
|
||||||
// Expanded from the old start, as an expansion always yields its own start
|
|
||||||
// even past UNTIL. COUNT is left out: it was spent before the new start.
|
|
||||||
val probe = spec.copy(
|
|
||||||
rrule = parts?.filterNot { it.startsWith("COUNT=", ignoreCase = true) }?.joinToString(";"),
|
|
||||||
anchor = Instant.fromEpochMilliseconds(was),
|
|
||||||
)
|
|
||||||
val from = Instant.fromEpochMilliseconds(now)
|
|
||||||
return RecurrenceExpander.expand(probe, ExpansionWindow(from = from, until = from + LOOKAHEAD, maxOccurrences = 1)).isNotEmpty()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The anchor a series' columns put it at: its start, or else its due date. */
|
|
||||||
fun anchor(state: Map<String, Any?>): Long? =
|
|
||||||
(state[Tasks.DTSTART] as? Number)?.toLong() ?: (state[Tasks.DUE] as? Number)?.toLong()
|
|
||||||
}
|
|
||||||
@@ -8,29 +8,25 @@ import de.jeanlucmakiola.agendula.domain.TaskList
|
|||||||
import de.jeanlucmakiola.agendula.domain.export.ExportTask
|
import de.jeanlucmakiola.agendula.domain.export.ExportTask
|
||||||
import de.jeanlucmakiola.agendula.domain.priorityFromICal
|
import de.jeanlucmakiola.agendula.domain.priorityFromICal
|
||||||
import de.jeanlucmakiola.agendula.domain.statusFromInt
|
import de.jeanlucmakiola.agendula.domain.statusFromInt
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceSpec
|
|
||||||
import kotlin.time.Instant
|
import kotlin.time.Instant
|
||||||
|
|
||||||
/** Maps a provider row (via [ColumnReader]) to a domain model. Pure + testable. */
|
/** Maps a provider row (via [ColumnReader]) to a domain model. Pure + testable. */
|
||||||
object TaskMapper {
|
object TaskMapper {
|
||||||
|
|
||||||
/**
|
fun task(r: ColumnReader): Task {
|
||||||
* Maps an `instances` row, without its series' rule: the dmfs instances view
|
|
||||||
* (DB 22 and 23) masks `rrule`/`rdate` with `NULL`, so the row alone cannot
|
|
||||||
* tell a series from a one-off on tasks.org's bundled provider (DB 22), which
|
|
||||||
* also lacks `is_recurring`. [withRule] completes it with the rule read from
|
|
||||||
* the master's `tasks` row. An override names its master in
|
|
||||||
* `original_instance_id`.
|
|
||||||
*/
|
|
||||||
fun instance(r: ColumnReader): InstanceRow {
|
|
||||||
fun instant(name: String): Instant? =
|
fun instant(name: String): Instant? =
|
||||||
r.getLong(name)?.let { Instant.fromEpochMilliseconds(it) }
|
r.getLong(name)?.let { Instant.fromEpochMilliseconds(it) }
|
||||||
|
|
||||||
val rowId = r.getLong(Tasks.ID) ?: 0L
|
val rowId = r.getLong(Tasks.ID) ?: 0L
|
||||||
val masterId = r.getLong(Tasks.ORIGINAL_INSTANCE_ID)
|
// Derived from the rule columns rather than the `is_recurring` column
|
||||||
val recurring = masterId != null || r.getBoolean(Instances.IS_RECURRING)
|
// alone: that column only exists from OpenTasks 1.4.0 (DB 23) and is
|
||||||
val anchor = occurrenceAnchor(r)
|
// absent on tasks.org's bundled provider (DB 22), where reading it
|
||||||
val task = Task(
|
// would silently report every recurring task as one-off — and route
|
||||||
|
// its edits onto the series anchor.
|
||||||
|
val recurring = r.getString(Tasks.RRULE) != null ||
|
||||||
|
r.getString(Tasks.RDATE) != null ||
|
||||||
|
r.getBoolean(Instances.IS_RECURRING)
|
||||||
|
return Task(
|
||||||
taskId = r.getLong(Instances.TASK_ID) ?: rowId,
|
taskId = r.getLong(Instances.TASK_ID) ?: rowId,
|
||||||
listId = r.getLong(Tasks.LIST_ID) ?: 0L,
|
listId = r.getLong(Tasks.LIST_ID) ?: 0L,
|
||||||
title = r.getString(Tasks.TITLE).orEmpty(),
|
title = r.getString(Tasks.TITLE).orEmpty(),
|
||||||
@@ -51,44 +47,12 @@ object TaskMapper {
|
|||||||
accountName = r.getString(Tasks.ACCOUNT_NAME),
|
accountName = r.getString(Tasks.ACCOUNT_NAME),
|
||||||
parentId = r.getLong(Tasks.PARENT_ID),
|
parentId = r.getLong(Tasks.PARENT_ID),
|
||||||
isRecurring = recurring,
|
isRecurring = recurring,
|
||||||
occurrenceStart = if (recurring) anchor else null,
|
occurrenceStart = if (recurring) occurrenceAnchor(r) else null,
|
||||||
distanceFromCurrent = r.getInt(Instances.DISTANCE_FROM_CURRENT),
|
distanceFromCurrent = r.getInt(Instances.DISTANCE_FROM_CURRENT),
|
||||||
created = instant(Tasks.CREATED),
|
created = instant(Tasks.CREATED),
|
||||||
lastModified = instant(Tasks.LAST_MODIFIED),
|
lastModified = instant(Tasks.LAST_MODIFIED),
|
||||||
seriesId = if (recurring) masterId ?: r.getLong(Instances.TASK_ID) ?: rowId else null,
|
seriesId = if (recurring) r.getLong(Instances.TASK_ID) ?: rowId else null,
|
||||||
)
|
recurrenceRule = r.getString(Tasks.RRULE),
|
||||||
return InstanceRow(task, ruleOwner = masterId ?: task.taskId, anchor = anchor)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** [row]'s task as an occurrence of the series [rule] belongs to, or as it is without one. */
|
|
||||||
fun withRule(row: InstanceRow, rule: SeriesRule?): Task {
|
|
||||||
if (rule == null) return row.task
|
|
||||||
return row.task.copy(
|
|
||||||
isRecurring = true,
|
|
||||||
occurrenceStart = row.task.occurrenceStart ?: row.anchor,
|
|
||||||
seriesId = row.task.seriesId ?: row.ruleOwner,
|
|
||||||
recurrenceRule = rule.rrule,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The rule columns of a `tasks` row, or null when it does not recur. */
|
|
||||||
fun seriesRule(r: ColumnReader): SeriesRule? {
|
|
||||||
val rrule = r.getString(Tasks.RRULE)?.ifBlank { null }
|
|
||||||
val rdate = r.getString(Tasks.RDATE)?.ifBlank { null }
|
|
||||||
return if (rrule == null && rdate == null) null else SeriesRule(rrule, rdate)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The rule set of a `tasks` row, anchored on its start or else its due date; null without either date. */
|
|
||||||
fun seriesSpec(r: ColumnReader): RecurrenceSpec? {
|
|
||||||
val rule = seriesRule(r)
|
|
||||||
val anchor = r.getLong(Tasks.DTSTART) ?: r.getLong(Tasks.DUE) ?: return null
|
|
||||||
return RecurrenceSpec(
|
|
||||||
rrule = rule?.rrule,
|
|
||||||
rdate = rule?.rdate,
|
|
||||||
exdate = r.getString(Tasks.EXDATE),
|
|
||||||
anchor = Instant.fromEpochMilliseconds(anchor),
|
|
||||||
isAllDay = r.getBoolean(Tasks.IS_ALLDAY),
|
|
||||||
timeZone = r.getString(Tasks.TZ),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,12 +119,3 @@ object TaskMapper {
|
|||||||
owner = r.getString(Lists.OWNER),
|
owner = r.getString(Lists.OWNER),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** A series' recurrence as stored on its master row. */
|
|
||||||
data class SeriesRule(val rrule: String?, val rdate: String?)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An instance row's task before its series' rule is applied. [ruleOwner] is the
|
|
||||||
* task whose `tasks` row carries that rule: the master, for an override.
|
|
||||||
*/
|
|
||||||
data class InstanceRow(val task: Task, val ruleOwner: Long, val anchor: Instant?)
|
|
||||||
@@ -17,20 +17,6 @@ private fun Instant.forAllDay(allDay: Boolean): Instant =
|
|||||||
Math.floorDiv(toEpochMilliseconds(), MILLIS_PER_DAY) * MILLIS_PER_DAY,
|
Math.floorDiv(toEpochMilliseconds(), MILLIS_PER_DAY) * MILLIS_PER_DAY,
|
||||||
)
|
)
|
||||||
|
|
||||||
/**
|
|
||||||
* Whole seconds, as iCalendar stores times. The provider expands a series from
|
|
||||||
* second-precision instants, so a DTSTART carrying milliseconds never matches its
|
|
||||||
* own first occurrence: completing it detaches a copy but leaves the series where
|
|
||||||
* it was, and the same occurrence comes straight back.
|
|
||||||
*/
|
|
||||||
fun providerMillis(epochMillis: Long): Long = Math.floorDiv(epochMillis, 1000L) * 1000L
|
|
||||||
|
|
||||||
/** [at] cut to its whole second, as [providerMillis] does. */
|
|
||||||
fun wholeSecond(at: Instant): Instant = Instant.fromEpochMilliseconds(providerMillis(at.toEpochMilliseconds()))
|
|
||||||
|
|
||||||
/** True when [a] and [b] fall in the same whole second. */
|
|
||||||
fun sameSecond(a: Instant, b: Instant): Boolean = wholeSecond(a) == wholeSecond(b)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Turns a [TaskForm] / mutation into a name→value map. Pure (no ContentValues),
|
* Turns a [TaskForm] / mutation into a name→value map. Pure (no ContentValues),
|
||||||
* so it unit-tests on the JVM; [AndroidTasksDataSource] converts the map to
|
* so it unit-tests on the JVM; [AndroidTasksDataSource] converts the map to
|
||||||
@@ -71,8 +57,8 @@ object TaskWriteMapper {
|
|||||||
// through DateTime.toAllDay(), which drops the time-of-day and resolves the
|
// through DateTime.toAllDay(), which drops the time-of-day and resolves the
|
||||||
// remaining date against UTC — so a local-midnight instant lands on the
|
// remaining date against UTC — so a local-midnight instant lands on the
|
||||||
// previous day for anyone west of UTC. Pin all-day values to UTC midnight.
|
// previous day for anyone west of UTC. Pin all-day values to UTC midnight.
|
||||||
put(Tasks.DTSTART, form.start?.forAllDay(form.isAllDay)?.toEpochMilliseconds()?.let(::providerMillis))
|
put(Tasks.DTSTART, form.start?.forAllDay(form.isAllDay)?.toEpochMilliseconds())
|
||||||
put(Tasks.DUE, form.due?.forAllDay(form.isAllDay)?.toEpochMilliseconds()?.let(::providerMillis))
|
put(Tasks.DUE, form.due?.forAllDay(form.isAllDay)?.toEpochMilliseconds())
|
||||||
// DUE and DURATION are mutually exclusive. The provider's Validating
|
// DUE and DURATION are mutually exclusive. The provider's Validating
|
||||||
// processor evaluates the *merged* row (supplied values over the stored
|
// processor evaluates the *merged* row (supplied values over the stored
|
||||||
// ones), so writing DUE onto a task that already carries a DURATION throws
|
// ones), so writing DUE onto a task that already carries a DURATION throws
|
||||||
|
|||||||
@@ -124,17 +124,13 @@ interface TasksDataSource {
|
|||||||
*
|
*
|
||||||
* Implementations fall back to [setCompleted] when the row turns out not to
|
* Implementations fall back to [setCompleted] when the row turns out not to
|
||||||
* be a series master — an override, or a plain task the caller happened to
|
* be a series master — an override, or a plain task the caller happened to
|
||||||
* hand an anchor for. A series whose occurrence cannot be found fails with
|
* hand an anchor for — so the routing above cannot get this wrong.
|
||||||
* [TaskWriteFailedException] instead: the plain write would close all of it.
|
|
||||||
*/
|
*/
|
||||||
fun setCompletedInstance(taskId: Long, occurrenceStart: Instant, completed: Boolean)
|
fun setCompletedInstance(taskId: Long, occurrenceStart: Instant, completed: Boolean)
|
||||||
|
|
||||||
/** Cancel (or restore) one occurrence of a series; the counterpart of [setCompletedInstance]. */
|
/** Cancel (or restore) one occurrence of a series; the counterpart of [setCompletedInstance]. */
|
||||||
fun setCancelledInstance(taskId: Long, occurrenceStart: Instant, cancelled: Boolean)
|
fun setCancelledInstance(taskId: Long, occurrenceStart: Instant, cancelled: Boolean)
|
||||||
fun deleteTask(taskId: Long)
|
fun deleteTask(taskId: Long)
|
||||||
|
|
||||||
/** Delete the override [taskId] standing for one occurrence, excluding that occurrence from its series. */
|
|
||||||
fun deleteOverride(taskId: Long, occurrenceStart: Instant) = deleteTask(taskId)
|
|
||||||
fun createLocalList(name: String, color: Int): Long
|
fun createLocalList(name: String, color: Int): Long
|
||||||
|
|
||||||
/** Rename and recolour [listId]. */
|
/** Rename and recolour [listId]. */
|
||||||
@@ -156,7 +152,4 @@ interface TasksDataSource {
|
|||||||
|
|
||||||
/** Observe any change to tasks/lists; [onChange] fires on a background thread. */
|
/** Observe any change to tasks/lists; [onChange] fires on a background thread. */
|
||||||
fun registerObserver(onChange: () -> Unit): AutoCloseable
|
fun registerObserver(onChange: () -> Unit): AutoCloseable
|
||||||
|
|
||||||
/** Like [registerObserver], but only for changes to tasks, lists and alarms — not account bookkeeping. */
|
|
||||||
fun registerTaskObserver(onChange: () -> Unit): AutoCloseable = registerObserver(onChange)
|
|
||||||
}
|
}
|
||||||
@@ -68,11 +68,9 @@ class TasksRepositoryImpl @Inject constructor(
|
|||||||
|
|
||||||
override fun taskDetail(taskId: Long, occurrenceStart: Instant?): Flow<TaskDetail?> = observing {
|
override fun taskDetail(taskId: Long, occurrenceStart: Instant?): Flow<TaskDetail?> = observing {
|
||||||
dataSource.task(taskId, occurrenceStart)?.let { task ->
|
dataSource.task(taskId, occurrenceStart)?.let { task ->
|
||||||
// A series' subtasks hang off its master, also when this occurrence is an override.
|
|
||||||
val owner = task.seriesId ?: resolvedRow(task, taskId)
|
|
||||||
TaskDetail(
|
TaskDetail(
|
||||||
task = task,
|
task = task,
|
||||||
subtasks = SeriesCollapse.visible(dataSource.subtasks(owner)).filter { it.taskId != owner },
|
subtasks = SeriesCollapse.visible(dataSource.subtasks(taskId)).filter { it.taskId != taskId },
|
||||||
parent = task.parentId?.takeIf { it > 0 }?.let { dataSource.task(it) },
|
parent = task.parentId?.takeIf { it > 0 }?.let { dataSource.task(it) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -174,9 +172,7 @@ class TasksRepositoryImpl @Inject constructor(
|
|||||||
) = withContext(io) {
|
) = withContext(io) {
|
||||||
// Re-read just before writing: it settles the conflict check *and* tells
|
// Re-read just before writing: it settles the conflict check *and* tells
|
||||||
// us which URI to write through.
|
// us which URI to write through.
|
||||||
// An occurrence that is gone is not written through to its series.
|
|
||||||
val current = dataSource.task(taskId, occurrenceStart)
|
val current = dataSource.task(taskId, occurrenceStart)
|
||||||
?: if (occurrenceStart != null) throw TaskWriteFailedException("update task $taskId@$occurrenceStart: gone") else null
|
|
||||||
// Conflict-safe overwrite: bail if the provider's last_modified moved
|
// Conflict-safe overwrite: bail if the provider's last_modified moved
|
||||||
// since the form captured it (external sync / another app). A null
|
// since the form captured it (external sync / another app). A null
|
||||||
// baseline means "force / overwrite anyway".
|
// baseline means "force / overwrite anyway".
|
||||||
@@ -205,7 +201,7 @@ class TasksRepositoryImpl @Inject constructor(
|
|||||||
// Going through the occurrence forks an override instead, which takes
|
// Going through the occurrence forks an override instead, which takes
|
||||||
// the reminders on its own row and leaves the series' alone.
|
// the reminders on its own row and leaves the series' alone.
|
||||||
val instance = current?.takeIf { it.isRecurring }?.occurrenceStart
|
val instance = current?.takeIf { it.isRecurring }?.occurrenceStart
|
||||||
if (instance == null) dataSource.updateTask(resolvedRow(current, taskId), form, reminders)
|
if (instance == null) dataSource.updateTask(taskId, form, reminders)
|
||||||
else dataSource.updateInstance(taskId, instance, form, reminders)
|
else dataSource.updateInstance(taskId, instance, form, reminders)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -237,16 +233,14 @@ class TasksRepositoryImpl @Inject constructor(
|
|||||||
override suspend fun deleteTask(taskId: Long, occurrenceStart: Instant?, scope: RecurringScope) =
|
override suspend fun deleteTask(taskId: Long, occurrenceStart: Instant?, scope: RecurringScope) =
|
||||||
withContext(io) {
|
withContext(io) {
|
||||||
val current = dataSource.task(taskId, occurrenceStart)
|
val current = dataSource.task(taskId, occurrenceStart)
|
||||||
// An occurrence that is gone leaves nothing to delete; its series stays.
|
|
||||||
if (current == null && occurrenceStart != null) return@withContext
|
|
||||||
val seriesId = current?.seriesId
|
val seriesId = current?.seriesId
|
||||||
val occurrence = current?.occurrenceStart
|
val occurrence = current?.occurrenceStart
|
||||||
if (seriesId == null || occurrence == null) return@withContext dataSource.deleteWithSubtasks(resolvedRow(current, taskId))
|
if (seriesId == null || occurrence == null) return@withContext dataSource.deleteWithSubtasks(taskId)
|
||||||
when (scope) {
|
when (scope) {
|
||||||
RecurringScope.ThisOccurrence ->
|
RecurringScope.ThisOccurrence ->
|
||||||
// An override row deletes itself into an EXDATE; a generated
|
// An override row deletes itself into an EXDATE; a generated
|
||||||
// occurrence has no row to delete.
|
// occurrence has no row to delete.
|
||||||
if (current.taskId != seriesId) dataSource.deleteOverride(current.taskId, occurrence)
|
if (current.taskId != seriesId) dataSource.deleteTask(current.taskId)
|
||||||
else dataSource.deleteOccurrence(seriesId, occurrence)
|
else dataSource.deleteOccurrence(seriesId, occurrence)
|
||||||
RecurringScope.ThisAndFollowing -> dataSource.deleteFollowing(seriesId, occurrence)
|
RecurringScope.ThisAndFollowing -> dataSource.deleteFollowing(seriesId, occurrence)
|
||||||
RecurringScope.AllOccurrences -> dataSource.deleteWithSubtasks(seriesId)
|
RecurringScope.AllOccurrences -> dataSource.deleteWithSubtasks(seriesId)
|
||||||
@@ -297,13 +291,6 @@ class TasksRepositoryImpl @Inject constructor(
|
|||||||
ticks.close()
|
ticks.close()
|
||||||
}
|
}
|
||||||
}.flowOn(io)
|
}.flowOn(io)
|
||||||
|
|
||||||
/**
|
|
||||||
* The row a read for [taskId] resolved to — a past occurrence the series moved
|
|
||||||
* past is a task of its own — which is the one a write has to address.
|
|
||||||
*/
|
|
||||||
private fun resolvedRow(resolved: Task?, taskId: Long): Long = resolved?.taskId ?: taskId
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Subtask levels a duplicate follows; deeper than any real list, short of a cycle. */
|
/** Subtask levels a duplicate follows; deeper than any real list, short of a cycle. */
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.tasks
|
|
||||||
|
|
||||||
import android.content.SharedPreferences
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The sub-tasks a provider tick reset, as [SubtaskReset.encode] writes them,
|
|
||||||
* kept for [TickedCopies.HORIZON_MS] under the series and the anchor the tick
|
|
||||||
* moved it to: whether or not the provider left a copy that [TickedCopies]
|
|
||||||
* could record, moving the series back from there finds them.
|
|
||||||
*/
|
|
||||||
internal class TickResets(private val prefs: () -> SharedPreferences) {
|
|
||||||
|
|
||||||
fun put(authority: String, seriesId: Long, anchor: Long, reset: String, at: Long) {
|
|
||||||
val stale = expire(prefs().all, at)
|
|
||||||
prefs().edit().apply {
|
|
||||||
stale.forEach(::remove)
|
|
||||||
putString(key(authority, seriesId, anchor), encode(at, reset))
|
|
||||||
}.apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun get(authority: String, seriesId: Long, anchor: Long): String? =
|
|
||||||
prefs().getString(key(authority, seriesId, anchor), null)?.let(::decode)
|
|
||||||
|
|
||||||
fun remove(authority: String, seriesId: Long, anchor: Long) {
|
|
||||||
prefs().edit().remove(key(authority, seriesId, anchor)).apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
fun key(authority: String, seriesId: Long, anchor: Long) = "$authority|$seriesId|$anchor"
|
|
||||||
|
|
||||||
fun encode(at: Long, reset: String) = "$at|$reset"
|
|
||||||
|
|
||||||
/** The reset an entry holds, or null when it is not one. */
|
|
||||||
fun decode(raw: String): String? = raw.substringBefore('|', "").toLongOrNull()?.let { raw.substringAfter('|') }
|
|
||||||
|
|
||||||
/** The keys of [entries] past the horizon at [now], unreadable ones included. */
|
|
||||||
fun expire(entries: Map<String, *>, now: Long): Set<String> = entries.filter { (_, value) ->
|
|
||||||
val at = (value as? String)?.substringBefore('|', "")?.toLongOrNull() ?: 0L
|
|
||||||
now - at > TickedCopies.HORIZON_MS
|
|
||||||
}.keys
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,133 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.tasks
|
|
||||||
|
|
||||||
import android.content.SharedPreferences
|
|
||||||
import org.json.JSONObject
|
|
||||||
import kotlin.time.Instant
|
|
||||||
|
|
||||||
/**
|
|
||||||
* What ticking a provider occurrence left: the copy the provider detached, and
|
|
||||||
* the series' columns before and after the tick, so an undo can move it back.
|
|
||||||
* [parentUid] is the parent a recurring sub-task's copy sits under. The
|
|
||||||
* sub-tasks it reset are kept apart, in [TickResets].
|
|
||||||
*/
|
|
||||||
internal class Tick(
|
|
||||||
val copyId: Long,
|
|
||||||
val seriesId: Long?,
|
|
||||||
val before: Map<String, Any?>?,
|
|
||||||
val after: Map<String, Any?>?,
|
|
||||||
val at: Long,
|
|
||||||
val parentUid: String? = null,
|
|
||||||
)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The provider keeps no record of its ticks, so they are kept here for
|
|
||||||
* [HORIZON_MS]. A recurring sub-task's copy stays known after that in [known],
|
|
||||||
* with the parent it sits under: a detached copy carries nothing that marks it
|
|
||||||
* as one.
|
|
||||||
*/
|
|
||||||
internal class TickedCopies(private val prefs: () -> SharedPreferences, private val known: () -> SharedPreferences) {
|
|
||||||
|
|
||||||
fun key(authority: String, taskId: Long, occurrenceStart: Instant) =
|
|
||||||
"$authority|$taskId|${wholeSecond(occurrenceStart).epochSeconds}"
|
|
||||||
|
|
||||||
fun get(key: String): Tick? = prefs().getString(key, null)?.let(::decode)
|
|
||||||
|
|
||||||
/** The tick that left [copyId], with its key. */
|
|
||||||
fun forCopy(authority: String, copyId: Long): Pair<String, Tick>? =
|
|
||||||
prefs().all.entries.firstNotNullOfOrNull { (key, value) ->
|
|
||||||
if (!key.startsWith("$authority|")) return@firstNotNullOfOrNull null
|
|
||||||
(value as? String)?.let(::decode)?.takeIf { it.copyId == copyId }?.let { key to it }
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Every recurring sub-task's copy a tick in Agendula left in [authority], with the UID of the parent it sits under. */
|
|
||||||
fun copies(authority: String): Map<Long, String> {
|
|
||||||
val copies = HashMap<Long, String>()
|
|
||||||
known().all.forEach { (key, value) ->
|
|
||||||
if (key.startsWith("$authority|")) key.substringAfter('|').toLongOrNull()?.let { id -> (value as? String)?.let { copies[id] = it } }
|
|
||||||
}
|
|
||||||
prefs().all.forEach { (key, value) ->
|
|
||||||
if (!key.startsWith("$authority|")) return@forEach
|
|
||||||
(value as? String)?.let(::decode)?.let { tick -> tick.parentUid?.let { copies[tick.copyId] = it } }
|
|
||||||
}
|
|
||||||
return copies
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Forgets the known copies [ids] of [authority], whose rows are gone. */
|
|
||||||
fun forget(authority: String, ids: Collection<Long>) {
|
|
||||||
if (ids.isEmpty()) return
|
|
||||||
known().edit().apply { ids.forEach { remove(knownKey(authority, it)) } }.apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Records [tick] under [key]; ticks past [HORIZON_MS] go, their sub-task copies stay known. */
|
|
||||||
fun put(key: String, tick: Tick) {
|
|
||||||
val (stale, keep) = expire(prefs().all.mapValues { (_, value) -> (value as? String)?.let(::decode) }, tick.at)
|
|
||||||
known().edit().apply {
|
|
||||||
keep.forEach { (authority, kept) -> kept.forEach { (id, parent) -> putString(knownKey(authority, id), parent) } }
|
|
||||||
}.apply()
|
|
||||||
prefs().edit().apply {
|
|
||||||
stale.forEach(::remove)
|
|
||||||
putString(key, encode(tick))
|
|
||||||
}.apply()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Drops the tick under [key], and its copy from the known ones: moving back deleted it, and its id may be reused. */
|
|
||||||
fun remove(key: String) {
|
|
||||||
val copy = get(key)?.copyId
|
|
||||||
prefs().edit().remove(key).apply()
|
|
||||||
if (copy != null) forget(key.substringBefore('|'), listOf(copy))
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun knownKey(authority: String, copyId: Long) = "$authority|$copyId"
|
|
||||||
|
|
||||||
private fun encode(tick: Tick): String = JSONObject().apply {
|
|
||||||
put("copy", tick.copyId)
|
|
||||||
put("at", tick.at)
|
|
||||||
tick.seriesId?.let { put("series", it) }
|
|
||||||
tick.before?.let { put("before", columns(it)) }
|
|
||||||
tick.after?.let { put("after", columns(it)) }
|
|
||||||
tick.parentUid?.let { put("parent", it) }
|
|
||||||
}.toString()
|
|
||||||
|
|
||||||
private fun columns(values: Map<String, Any?>) = JSONObject().apply {
|
|
||||||
values.forEach { (column, value) -> put(column, value ?: JSONObject.NULL) }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun decode(raw: String): Tick? = runCatching {
|
|
||||||
val json = JSONObject(raw)
|
|
||||||
Tick(
|
|
||||||
copyId = json.getLong("copy"),
|
|
||||||
seriesId = if (json.has("series")) json.getLong("series") else null,
|
|
||||||
before = json.optJSONObject("before")?.let(::values),
|
|
||||||
after = json.optJSONObject("after")?.let(::values),
|
|
||||||
at = json.getLong("at"),
|
|
||||||
parentUid = if (json.has("parent")) json.getString("parent") else null,
|
|
||||||
)
|
|
||||||
}.getOrNull()
|
|
||||||
|
|
||||||
private fun values(json: JSONObject): Map<String, Any?> = json.keys().asSequence().associateWith { column ->
|
|
||||||
when (val value = json.get(column)) {
|
|
||||||
JSONObject.NULL -> null
|
|
||||||
is Number -> value.toLong()
|
|
||||||
else -> value.toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
/** As long as the own store keeps a tick undoable. */
|
|
||||||
const val HORIZON_MS = 30L * 24 * 60 * 60 * 1000
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The keys of [ticks] past the horizon at [now], unreadable ones included,
|
|
||||||
* and per authority the sub-task copies they leave, with their parent's
|
|
||||||
* UID, which stay known after the tick goes. A top-level copy is not kept.
|
|
||||||
*/
|
|
||||||
fun expire(ticks: Map<String, Tick?>, now: Long): Pair<Set<String>, Map<String, Map<Long, String>>> {
|
|
||||||
val stale = ticks.filter { (_, tick) -> now - (tick?.at ?: 0L) > HORIZON_MS }
|
|
||||||
val keep = stale.entries
|
|
||||||
.mapNotNull { (key, tick) -> tick?.parentUid?.let { Triple(key.substringBefore('|'), tick.copyId, it) } }
|
|
||||||
.groupBy({ it.first }, { it.second to it.third })
|
|
||||||
.mapValues { it.value.toMap() }
|
|
||||||
return stale.keys to keep
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -461,8 +461,8 @@ object VTodoMapper {
|
|||||||
"PERCENT-COMPLETE" -> entity.percentComplete != null
|
"PERCENT-COMPLETE" -> entity.percentComplete != null
|
||||||
"CLASS" -> entity.classification != null
|
"CLASS" -> entity.classification != null
|
||||||
"CATEGORIES" -> entity.categories != residueCategories
|
"CATEGORIES" -> entity.categories != residueCategories
|
||||||
// Raised by an upload (#137); kept as the server sent it otherwise.
|
// Not SEQUENCE: it is the organiser's counter and never ours to bump,
|
||||||
"SEQUENCE" -> entity.sequence != 0
|
// so the column stays at its fallback and the residue always wins.
|
||||||
else -> false
|
else -> false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -573,13 +573,6 @@ object VTodoMapper {
|
|||||||
|
|
||||||
private fun ICalProperty.text(): String = ICalValues.unescapeText(value)
|
private fun ICalProperty.text(): String = ICalValues.unescapeText(value)
|
||||||
|
|
||||||
/**
|
|
||||||
* Whether an upload of [entity] should raise its `SEQUENCE` (RFC 5545 §3.8.7.4).
|
|
||||||
* Not for a scheduled task, where the counter is the organiser's.
|
|
||||||
*/
|
|
||||||
fun revisesSequence(entity: TaskEntity): Boolean =
|
|
||||||
parseResidue(entity.unknownProperties).properties("ORGANIZER").isEmpty()
|
|
||||||
|
|
||||||
private fun parseResidue(text: String?): ICalComponent {
|
private fun parseResidue(text: String?): ICalComponent {
|
||||||
if (text.isNullOrEmpty()) return ICalComponent("VTODO")
|
if (text.isNullOrEmpty()) return ICalComponent("VTODO")
|
||||||
// The residue is stored as bare properties followed by whole sub-component
|
// The residue is stored as bare properties followed by whole sub-component
|
||||||
|
|||||||
+28
-22
@@ -1,7 +1,8 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.tasks.provider
|
package de.jeanlucmakiola.agendula.data.tasks.provider
|
||||||
|
|
||||||
import android.database.sqlite.SQLiteConstraintException
|
import android.database.sqlite.SQLiteConstraintException
|
||||||
import de.jeanlucmakiola.agendula.data.reminders.ReminderRefresher
|
import de.jeanlucmakiola.agendula.data.di.ApplicationScope
|
||||||
|
import de.jeanlucmakiola.agendula.data.reminders.ReminderScheduler
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.ProviderResolver
|
import de.jeanlucmakiola.agendula.data.tasks.ProviderResolver
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.StorageMode
|
import de.jeanlucmakiola.agendula.data.tasks.StorageMode
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TaskWriteFailedException
|
import de.jeanlucmakiola.agendula.data.tasks.TaskWriteFailedException
|
||||||
@@ -18,6 +19,8 @@ import de.jeanlucmakiola.agendula.data.tasks.room.TasksDatabase
|
|||||||
import de.jeanlucmakiola.agendula.data.tasks.room.seriesOccurrences
|
import de.jeanlucmakiola.agendula.data.tasks.room.seriesOccurrences
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskStatus
|
import de.jeanlucmakiola.agendula.domain.TaskStatus
|
||||||
import de.jeanlucmakiola.agendula.domain.normalizeTags
|
import de.jeanlucmakiola.agendula.domain.normalizeTags
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
import java.time.ZoneId
|
import java.time.ZoneId
|
||||||
import java.util.UUID
|
import java.util.UUID
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
@@ -55,40 +58,47 @@ class ProviderWriter internal constructor(
|
|||||||
store: RoomTasksDataSource,
|
store: RoomTasksDataSource,
|
||||||
source: ProviderSnapshotSource,
|
source: ProviderSnapshotSource,
|
||||||
resolver: ProviderResolver,
|
resolver: ProviderResolver,
|
||||||
reminders: ReminderRefresher,
|
scheduler: ReminderScheduler,
|
||||||
) : this(database, store, source, resolver, reminders::requestRefresh)
|
@ApplicationScope scope: CoroutineScope,
|
||||||
|
) : this(database, store, source, resolver, { scope.launch { runCatching { scheduler.sync() } } })
|
||||||
|
|
||||||
private var batchDepth = 0
|
private var batchDepth = 0
|
||||||
private var batchWrote = false
|
private var batchWrote = false
|
||||||
|
|
||||||
/** Inserts one row and returns its published id. */
|
/** Inserts one row and returns its published id. */
|
||||||
fun insert(table: ProviderTable, values: ProviderValues): Long = when (table) {
|
fun insert(table: ProviderTable, values: ProviderValues): Long = write {
|
||||||
ProviderTable.TASKS -> write { insertTask(values) }
|
when (table) {
|
||||||
ProviderTable.PROPERTIES -> write { insertProperty(values) }
|
ProviderTable.TASKS -> insertTask(values)
|
||||||
ProviderTable.LISTS, ProviderTable.INSTANCES -> readOnly(table)
|
ProviderTable.PROPERTIES -> insertProperty(values)
|
||||||
|
else -> throw UnsupportedOperationException("${table.path} is read-only")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Updates every row [selection] matches and returns how many changed. */
|
/** Updates every row [selection] matches and returns how many changed. */
|
||||||
fun update(table: ProviderTable, values: ProviderValues, selection: String?, args: Array<out String>?): Int = when (table) {
|
fun update(table: ProviderTable, values: ProviderValues, selection: String?, args: Array<out String>?): Int = write {
|
||||||
ProviderTable.TASKS -> write {
|
when (table) {
|
||||||
|
ProviderTable.TASKS -> {
|
||||||
val writable = ProviderTaskWriter.writable(table, values, WRITABLE_TASK_COLUMNS)
|
val writable = ProviderTaskWriter.writable(table, values, WRITABLE_TASK_COLUMNS)
|
||||||
val matched = ids(table, selection, args)
|
val matched = ids(table, selection, args)
|
||||||
(if (Tasks.LIST_ID in writable) parentsFirst(matched) else matched).count { updateTask(it, writable) }
|
(if (Tasks.LIST_ID in writable) parentsFirst(matched) else matched).count { updateTask(it, writable) }
|
||||||
}
|
}
|
||||||
ProviderTable.INSTANCES -> write {
|
ProviderTable.INSTANCES -> {
|
||||||
val writable = ProviderTaskWriter.writable(table, values, WRITABLE_TASK_COLUMNS)
|
val writable = ProviderTaskWriter.writable(table, values, WRITABLE_TASK_COLUMNS)
|
||||||
instances(selection, args).count { updateInstance(it, writable) }
|
instances(selection, args).count { updateInstance(it, writable) }
|
||||||
}
|
}
|
||||||
ProviderTable.PROPERTIES -> write { ids(table, selection, args).count { updateProperty(it, values) } }
|
ProviderTable.PROPERTIES -> ids(table, selection, args).count { updateProperty(it, values) }
|
||||||
ProviderTable.LISTS -> readOnly(table)
|
else -> throw UnsupportedOperationException("${table.path} is read-only")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Deletes every row [selection] matches and returns how many went. */
|
/** Deletes every row [selection] matches and returns how many went. */
|
||||||
fun delete(table: ProviderTable, selection: String?, args: Array<out String>?): Int = when (table) {
|
fun delete(table: ProviderTable, selection: String?, args: Array<out String>?): Int = write {
|
||||||
ProviderTable.TASKS -> write { ids(table, selection, args).count { deleteTask(it) } }
|
when (table) {
|
||||||
ProviderTable.INSTANCES -> write { instances(selection, args).count { deleteInstance(it) } }
|
ProviderTable.TASKS -> ids(table, selection, args).count { deleteTask(it) }
|
||||||
ProviderTable.PROPERTIES -> write { ids(table, selection, args).count { deleteProperty(it) } }
|
ProviderTable.INSTANCES -> instances(selection, args).count { deleteInstance(it) }
|
||||||
ProviderTable.LISTS -> readOnly(table)
|
ProviderTable.PROPERTIES -> ids(table, selection, args).count { deleteProperty(it) }
|
||||||
|
else -> throw UnsupportedOperationException("${table.path} is read-only")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Runs a client's batch in one transaction, re-arming reminders once at the end. */
|
/** Runs a client's batch in one transaction, re-arming reminders once at the end. */
|
||||||
@@ -107,9 +117,6 @@ class ProviderWriter internal constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Refused as read-only whichever store is active, before the store is even looked at. */
|
|
||||||
private fun readOnly(table: ProviderTable): Nothing = throw UnsupportedOperationException("${table.path} is read-only")
|
|
||||||
|
|
||||||
private fun <T> write(block: () -> T): T = source.locked {
|
private fun <T> write(block: () -> T): T = source.locked {
|
||||||
check(resolver.mode() == StorageMode.OWN) {
|
check(resolver.mode() == StorageMode.OWN) {
|
||||||
"Agendula is working on top of an external tasks provider; write to that one instead"
|
"Agendula is working on top of an external tasks provider; write to that one instead"
|
||||||
@@ -189,8 +196,7 @@ class ProviderWriter internal constructor(
|
|||||||
val current = database.tasks().entity(taskId)?.takeUnless { it.isDeleted } ?: return false
|
val current = database.tasks().entity(taskId)?.takeUnless { it.isDeleted } ?: return false
|
||||||
requireWritableList(current.listId)
|
requireWritableList(current.listId)
|
||||||
// An override deletes itself into an EXDATE on its master.
|
// An override deletes itself into an EXDATE on its master.
|
||||||
val occurrence = current.recurrenceId
|
if (current.masterId != null) store.deleteTask(taskId) else store.deleteWithSubtasks(taskId)
|
||||||
if (current.masterId != null && occurrence != null) store.deleteOverride(taskId, occurrence) else store.deleteWithSubtasks(taskId)
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,133 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.tasks.room
|
|
||||||
|
|
||||||
import androidx.room.ColumnInfo
|
|
||||||
import androidx.room.Dao
|
|
||||||
import androidx.room.Entity
|
|
||||||
import androidx.room.ForeignKey
|
|
||||||
import androidx.room.Index
|
|
||||||
import androidx.room.Insert
|
|
||||||
import androidx.room.OnConflictStrategy
|
|
||||||
import androidx.room.PrimaryKey
|
|
||||||
import androidx.room.Query
|
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskStatus
|
|
||||||
import kotlin.time.Instant
|
|
||||||
|
|
||||||
/**
|
|
||||||
* How a series was moved past one of its occurrences (#137). It maps the
|
|
||||||
* occurrence to its completed copy for as long as the copy lives, and while
|
|
||||||
* [undoable] it also holds what reopening the copy needs to move the series
|
|
||||||
* back: the change, not the old series, so edits made since are kept. Local
|
|
||||||
* only: never part of a `VTODO`.
|
|
||||||
*/
|
|
||||||
@Entity(
|
|
||||||
tableName = "advanced_occurrences",
|
|
||||||
foreignKeys = [
|
|
||||||
ForeignKey(entity = TaskEntity::class, parentColumns = ["id"], childColumns = ["copy_id"], onDelete = ForeignKey.CASCADE),
|
|
||||||
ForeignKey(entity = TaskEntity::class, parentColumns = ["id"], childColumns = ["master_id"], onDelete = ForeignKey.CASCADE),
|
|
||||||
],
|
|
||||||
indices = [Index(value = ["master_id", "anchor"])],
|
|
||||||
)
|
|
||||||
data class AdvancedOccurrenceEntity(
|
|
||||||
/** The completed copy of the occurrence. */
|
|
||||||
@PrimaryKey @ColumnInfo(name = "copy_id") val copyId: Long,
|
|
||||||
@ColumnInfo(name = "master_id") val masterId: Long,
|
|
||||||
@ColumnInfo(name = "anchor") val anchor: Instant,
|
|
||||||
/** The anchor the series moved to; it is only moved back while it still has it. */
|
|
||||||
@ColumnInfo(name = "advanced_to") val advancedTo: Instant,
|
|
||||||
@ColumnInfo(name = "prior_dtstart") val priorDtstart: Instant?,
|
|
||||||
@ColumnInfo(name = "prior_due") val priorDue: Instant?,
|
|
||||||
@ColumnInfo(name = "prior_status") val priorStatus: TaskStatus,
|
|
||||||
@ColumnInfo(name = "prior_percent_complete") val priorPercentComplete: Int?,
|
|
||||||
@ColumnInfo(name = "prior_completed_at") val priorCompletedAt: Instant?,
|
|
||||||
/** Occurrences `COUNT` lost to the move. */
|
|
||||||
@ColumnInfo(name = "spent") val spent: Int,
|
|
||||||
/** The `RRULE` the move left; once it differs, the series was reshaped and is not moved back. */
|
|
||||||
@ColumnInfo(name = "rule_after") val ruleAfter: String?,
|
|
||||||
/** The `EXDATE` occurrences the move dropped, as epoch millis, comma-separated. */
|
|
||||||
@ColumnInfo(name = "dropped_exdates", defaultValue = "") val droppedExdates: String = "",
|
|
||||||
/** The copy was an override before, and goes back to being one. */
|
|
||||||
@ColumnInfo(name = "from_override") val fromOverride: Boolean,
|
|
||||||
/** Cleared once the copy is edited, moved or reopened on its own: it is then a task of its own. */
|
|
||||||
@ColumnInfo(name = "undoable", defaultValue = "1") val undoable: Boolean = true,
|
|
||||||
/** Set once the moved series reached the server, which then holds the move itself. */
|
|
||||||
@ColumnInfo(name = "settled", defaultValue = "0") val settled: Boolean = false,
|
|
||||||
/** The series' sub-tasks the move reset, with their state before, as [de.jeanlucmakiola.agendula.data.tasks.SubtaskReset.encode] writes them. */
|
|
||||||
@ColumnInfo(name = "reset_subtasks", defaultValue = "") val resetSubtasks: String = "",
|
|
||||||
) {
|
|
||||||
val dropped: List<Instant>
|
|
||||||
get() = droppedExdates.split(',').mapNotNull { it.toLongOrNull()?.let(Instant::fromEpochMilliseconds) }
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
fun encode(instants: List<Instant>) = instants.joinToString(",") { it.toEpochMilliseconds().toString() }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** A closed override detached along with an advance; [taskId] is null once that row is gone. */
|
|
||||||
@Entity(
|
|
||||||
tableName = "advanced_detached",
|
|
||||||
foreignKeys = [
|
|
||||||
ForeignKey(
|
|
||||||
entity = AdvancedOccurrenceEntity::class,
|
|
||||||
parentColumns = ["copy_id"],
|
|
||||||
childColumns = ["copy_id"],
|
|
||||||
onDelete = ForeignKey.CASCADE,
|
|
||||||
),
|
|
||||||
ForeignKey(entity = TaskEntity::class, parentColumns = ["id"], childColumns = ["task_id"], onDelete = ForeignKey.SET_NULL),
|
|
||||||
],
|
|
||||||
indices = [Index(value = ["copy_id"]), Index(value = ["task_id"])],
|
|
||||||
)
|
|
||||||
data class AdvancedDetachedEntity(
|
|
||||||
@PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") val id: Long = 0,
|
|
||||||
@ColumnInfo(name = "copy_id") val copyId: Long,
|
|
||||||
@ColumnInfo(name = "anchor") val anchor: Instant,
|
|
||||||
@ColumnInfo(name = "task_id") val taskId: Long?,
|
|
||||||
)
|
|
||||||
|
|
||||||
@Dao
|
|
||||||
interface AdvancedOccurrenceDao {
|
|
||||||
@Insert(onConflict = OnConflictStrategy.REPLACE)
|
|
||||||
fun insert(row: AdvancedOccurrenceEntity)
|
|
||||||
|
|
||||||
@Insert
|
|
||||||
fun insertDetached(rows: List<AdvancedDetachedEntity>)
|
|
||||||
|
|
||||||
@Query("SELECT * FROM advanced_occurrences WHERE copy_id = :copyId")
|
|
||||||
fun forCopy(copyId: Long): AdvancedOccurrenceEntity?
|
|
||||||
|
|
||||||
@Query("SELECT * FROM advanced_detached WHERE copy_id = :copyId")
|
|
||||||
fun detachedFor(copyId: Long): List<AdvancedDetachedEntity>
|
|
||||||
|
|
||||||
@Query("SELECT * FROM advanced_occurrences WHERE master_id = :masterId")
|
|
||||||
fun forMaster(masterId: Long): List<AdvancedOccurrenceEntity>
|
|
||||||
|
|
||||||
/** The record for [masterId]'s occurrence within the second starting at [secondStart]. */
|
|
||||||
@Query(
|
|
||||||
"SELECT * FROM advanced_occurrences WHERE master_id = :masterId " +
|
|
||||||
"AND anchor >= :secondStart AND anchor < :secondStart + 1000",
|
|
||||||
)
|
|
||||||
fun at(masterId: Long, secondStart: Instant): AdvancedOccurrenceEntity?
|
|
||||||
|
|
||||||
@Query("DELETE FROM advanced_occurrences WHERE copy_id = :copyId")
|
|
||||||
fun delete(copyId: Long)
|
|
||||||
|
|
||||||
@Query("UPDATE advanced_occurrences SET undoable = 0 WHERE copy_id = :copyId")
|
|
||||||
fun keepAsOwnTask(copyId: Long)
|
|
||||||
|
|
||||||
@Query("UPDATE advanced_occurrences SET settled = 1 WHERE master_id IN (:masterIds)")
|
|
||||||
fun settle(masterIds: List<Long>)
|
|
||||||
|
|
||||||
/** Settles [masterId]'s moves to before [until], the anchor the server now holds. */
|
|
||||||
@Query("UPDATE advanced_occurrences SET settled = 1 WHERE master_id = :masterId AND advanced_to < :until")
|
|
||||||
fun settleUpTo(masterId: Long, until: Instant)
|
|
||||||
|
|
||||||
/** Records of ticks made before [before]: too old to undo. Counted from the tick, not the occurrence, which may be long overdue. */
|
|
||||||
@Query(
|
|
||||||
"DELETE FROM advanced_occurrences WHERE master_id = :masterId " +
|
|
||||||
"AND copy_id IN (SELECT id FROM tasks WHERE created_at < :before)",
|
|
||||||
)
|
|
||||||
fun pruneTickedBefore(masterId: Long, before: Instant)
|
|
||||||
|
|
||||||
/** [taskId], once detached with a tick, has a life of its own and no longer returns to the series. */
|
|
||||||
@Query("UPDATE advanced_detached SET task_id = NULL WHERE task_id = :taskId")
|
|
||||||
fun unlinkDetached(taskId: Long)
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@ import de.jeanlucmakiola.agendula.domain.LocalAccount
|
|||||||
import de.jeanlucmakiola.agendula.domain.Task
|
import de.jeanlucmakiola.agendula.domain.Task
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskList
|
import de.jeanlucmakiola.agendula.domain.TaskList
|
||||||
import de.jeanlucmakiola.agendula.domain.export.ExportTask
|
import de.jeanlucmakiola.agendula.domain.export.ExportTask
|
||||||
import de.jeanlucmakiola.agendula.domain.isClosed
|
|
||||||
import de.jeanlucmakiola.agendula.domain.priorityFromICal
|
import de.jeanlucmakiola.agendula.domain.priorityFromICal
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceSpec
|
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceSpec
|
||||||
import kotlin.time.Instant
|
import kotlin.time.Instant
|
||||||
@@ -101,10 +100,6 @@ object RoomTaskMapper {
|
|||||||
val TaskEntity.isRecurring: Boolean
|
val TaskEntity.isRecurring: Boolean
|
||||||
get() = !rrule.isNullOrBlank() || !rdate.isNullOrBlank()
|
get() = !rrule.isNullOrBlank() || !rdate.isNullOrBlank()
|
||||||
|
|
||||||
/** Completed or cancelled. */
|
|
||||||
val TaskEntity.isClosed: Boolean
|
|
||||||
get() = status.isClosed
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The series anchor: `DTSTART` when present, else `DUE`. A `VTODO` may carry only
|
* The series anchor: `DTSTART` when present, else `DUE`. A `VTODO` may carry only
|
||||||
* a due date, and RFC 5545 then anchors the recurrence on it — matching how the
|
* a due date, and RFC 5545 then anchors the recurrence on it — matching how the
|
||||||
|
|||||||
+55
-431
@@ -1,32 +1,19 @@
|
|||||||
package de.jeanlucmakiola.agendula.data.tasks.room
|
package de.jeanlucmakiola.agendula.data.tasks.room
|
||||||
|
|
||||||
import android.util.Log
|
|
||||||
import androidx.room.InvalidationTracker
|
import androidx.room.InvalidationTracker
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.ResetSubtask
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.SeriesShift
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.SubtaskDates
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.SubtaskNode
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.SubtaskNow
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.SubtaskReset
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.SubtaskState
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TaskQuery
|
import de.jeanlucmakiola.agendula.data.tasks.TaskQuery
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskReminder
|
import de.jeanlucmakiola.agendula.domain.TaskReminder
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskReminderOrder
|
import de.jeanlucmakiola.agendula.domain.TaskReminderOrder
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TaskWriteFailedException
|
import de.jeanlucmakiola.agendula.data.tasks.TaskWriteFailedException
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TasksDataSource
|
import de.jeanlucmakiola.agendula.data.tasks.TasksDataSource
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.sameSecond
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.wholeSecond
|
|
||||||
import de.jeanlucmakiola.agendula.domain.Task
|
import de.jeanlucmakiola.agendula.domain.Task
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskForm
|
import de.jeanlucmakiola.agendula.domain.TaskForm
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskList
|
import de.jeanlucmakiola.agendula.domain.TaskList
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskStatus
|
import de.jeanlucmakiola.agendula.domain.TaskStatus
|
||||||
import de.jeanlucmakiola.agendula.domain.export.ExportTask
|
import de.jeanlucmakiola.agendula.domain.export.ExportTask
|
||||||
import de.jeanlucmakiola.agendula.domain.normalizeTags
|
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.ExpansionWindow
|
import de.jeanlucmakiola.agendula.domain.recurrence.ExpansionWindow
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceExpander
|
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceExpander
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.RecurrenceSpec
|
|
||||||
import java.time.ZoneId
|
import java.time.ZoneId
|
||||||
import de.jeanlucmakiola.agendula.domain.recurrence.dateZone
|
|
||||||
import java.util.UUID
|
import java.util.UUID
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
import javax.inject.Singleton
|
import javax.inject.Singleton
|
||||||
@@ -41,12 +28,6 @@ private val WINDOW_FORWARD = 730.days
|
|||||||
/** Residue lines that describe the old series and must not follow the new one. */
|
/** Residue lines that describe the old series and must not follow the new one. */
|
||||||
private val SERIES_LINES = listOf("EXDATE", "RDATE", "RRULE", "RECURRENCE-ID", "UID")
|
private val SERIES_LINES = listOf("EXDATE", "RDATE", "RRULE", "RECURRENCE-ID", "UID")
|
||||||
|
|
||||||
/** How long a record keeps mapping a ticked occurrence to its copy. */
|
|
||||||
private val RECORD_HORIZON = 30.days
|
|
||||||
|
|
||||||
/** Only bounds the search: the occurrence count is what stops expansion, so no real gap is cut off. */
|
|
||||||
private val SERIES_LOOKAHEAD = (366 * 1000).days
|
|
||||||
|
|
||||||
/** Enough to count every occurrence before a split point without bounding a real series. */
|
/** Enough to count every occurrence before a split point without bounding a real series. */
|
||||||
internal const val SPLIT_COUNT_CEILING = 100_000
|
internal const val SPLIT_COUNT_CEILING = 100_000
|
||||||
|
|
||||||
@@ -95,13 +76,10 @@ internal fun seriesOccurrences(master: TaskEntity, overrides: List<TaskEntity>,
|
|||||||
}
|
}
|
||||||
|
|
||||||
internal val OBSERVED_TABLES = arrayOf("tasks", "task_lists", "task_alarms", "accounts")
|
internal val OBSERVED_TABLES = arrayOf("tasks", "task_lists", "task_alarms", "accounts")
|
||||||
private val TASK_TABLES = arrayOf("tasks", "task_lists", "task_alarms")
|
|
||||||
|
|
||||||
/** Distinct alarm texts whose `ACKNOWLEDGED` is remembered between scheduler passes. */
|
/** Distinct alarm texts whose `ACKNOWLEDGED` is remembered between scheduler passes. */
|
||||||
private const val ACK_CACHE_SIZE = 512
|
private const val ACK_CACHE_SIZE = 512
|
||||||
|
|
||||||
private const val TAG = "RoomTasksDataSource"
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [TasksDataSource] over Agendula's own Room store.
|
* [TasksDataSource] over Agendula's own Room store.
|
||||||
*
|
*
|
||||||
@@ -124,7 +102,6 @@ class RoomTasksDataSource @Inject constructor(
|
|||||||
private val tasks get() = database.tasks()
|
private val tasks get() = database.tasks()
|
||||||
private val lists get() = database.taskLists()
|
private val lists get() = database.taskLists()
|
||||||
private val alarms get() = database.alarms()
|
private val alarms get() = database.alarms()
|
||||||
private val advanced get() = database.advancedOccurrences()
|
|
||||||
|
|
||||||
// --- reads ----------------------------------------------------------------
|
// --- reads ----------------------------------------------------------------
|
||||||
|
|
||||||
@@ -152,13 +129,9 @@ class RoomTasksDataSource @Inject constructor(
|
|||||||
if (occurrenceStart == null) return task(taskId)
|
if (occurrenceStart == null) return task(taskId)
|
||||||
val row = tasks.task(taskId) ?: return null
|
val row = tasks.task(taskId) ?: return null
|
||||||
if (row.task.recurrenceId != null || !row.task.isRecurring) return task(taskId)
|
if (row.task.recurrenceId != null || !row.task.isRecurring) return task(taskId)
|
||||||
val occurrences = occurrencesOf(row, tasks.overrides(taskId), clock.now())
|
return occurrencesOf(row, tasks.overrides(taskId), clock.now())
|
||||||
// Null rather than another occurrence: a write addressed to this one must not land on that.
|
.firstOrNull { it.occurrenceStart == occurrenceStart }
|
||||||
return occurrences.firstOrNull { it.occurrenceStart == occurrenceStart }
|
?: task(taskId)
|
||||||
?: occurrences.firstOrNull { it.occurrenceStart?.let { a -> sameSecond(a, occurrenceStart) } == true }
|
|
||||||
?: copyAt(row.task, occurrenceStart)?.let { copy ->
|
|
||||||
tasks.task(copy.id)?.let { RoomTaskMapper.task(it).copy(occurrenceStart = occurrenceStart) }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun overrideTask(row: TaskRow, anchor: Instant): Task =
|
private fun overrideTask(row: TaskRow, anchor: Instant): Task =
|
||||||
@@ -256,8 +229,10 @@ class RoomTasksDataSource @Inject constructor(
|
|||||||
* reminders sync, a sync landing between the two would upload the task
|
* reminders sync, a sync landing between the two would upload the task
|
||||||
* without them, or with the ones it is about to lose.
|
* without them, or with the ones it is about to lose.
|
||||||
*/
|
*/
|
||||||
private fun writeReminders(taskId: Long, reminders: List<TaskReminder>?): Boolean =
|
private fun writeReminders(taskId: Long, reminders: List<TaskReminder>?) {
|
||||||
reminders != null && alarms.syncForTask(taskId, reminders)
|
if (reminders == null) return
|
||||||
|
alarms.syncForTask(taskId, reminders)
|
||||||
|
}
|
||||||
|
|
||||||
private fun storedReminders(taskId: Long): List<TaskReminder> =
|
private fun storedReminders(taskId: Long): List<TaskReminder> =
|
||||||
alarms.forTask(taskId).map { it.asReminder() }.sortedWith(TaskReminderOrder)
|
alarms.forTask(taskId).map { it.asReminder() }.sortedWith(TaskReminderOrder)
|
||||||
@@ -265,7 +240,7 @@ class RoomTasksDataSource @Inject constructor(
|
|||||||
override fun updateTask(taskId: Long, form: TaskForm, reminders: List<TaskReminder>?) = tx {
|
override fun updateTask(taskId: Long, form: TaskForm, reminders: List<TaskReminder>?) = tx {
|
||||||
val current = tasks.entity(taskId) ?: throw TaskWriteFailedException("update task $taskId")
|
val current = tasks.entity(taskId) ?: throw TaskWriteFailedException("update task $taskId")
|
||||||
val edited = TaskFormWriter.apply(current, form, clock.now(), zone())
|
val edited = TaskFormWriter.apply(current, form, clock.now(), zone())
|
||||||
val remindersChanged = writeReminders(taskId, reminders)
|
writeReminders(taskId, reminders)
|
||||||
if (current.masterId == null && edited.listId != current.listId) {
|
if (current.masterId == null && edited.listId != current.listId) {
|
||||||
if (lists.exists(edited.listId) == 0) throw TaskWriteFailedException("move task: no list ${edited.listId}")
|
if (lists.exists(edited.listId) == 0) throw TaskWriteFailedException("move task: no list ${edited.listId}")
|
||||||
move(current, TaskFormWriter.withRule(edited, form.rrule))
|
move(current, TaskFormWriter.withRule(edited, form.rrule))
|
||||||
@@ -280,23 +255,18 @@ class RoomTasksDataSource @Inject constructor(
|
|||||||
// in both (the task query skips non-null `master_id`, and the override
|
// in both (the task query skips non-null `master_id`, and the override
|
||||||
// query finds no master in B) while still uploading as part of A's
|
// query finds no master in B) while still uploading as part of A's
|
||||||
// resource.
|
// resource.
|
||||||
saveRow(
|
tasks.update(
|
||||||
current,
|
|
||||||
if (current.masterId == null) {
|
if (current.masterId == null) {
|
||||||
TaskFormWriter.withRule(edited, form.rrule)
|
TaskFormWriter.withRule(edited, form.rrule)
|
||||||
} else {
|
} else {
|
||||||
edited.copy(listId = current.listId, parentId = current.parentId)
|
edited.copy(listId = current.listId, parentId = current.parentId)
|
||||||
},
|
},
|
||||||
changedBesides = remindersChanged,
|
|
||||||
)
|
)
|
||||||
writes.onWritten(setOf(current.listId))
|
writes.onWritten(setOf(current.listId))
|
||||||
}
|
}
|
||||||
|
|
||||||
/** See [TaskMove]: the rows move, and the old collection is left a tombstone. */
|
/** See [TaskMove]: the rows move, and the old collection is left a tombstone. */
|
||||||
private fun move(current: TaskEntity, edited: TaskEntity) {
|
private fun move(current: TaskEntity, edited: TaskEntity) {
|
||||||
// A copy moved elsewhere is a task of its own now.
|
|
||||||
advanced.keepAsOwnTask(current.id)
|
|
||||||
advanced.unlinkDetached(current.id)
|
|
||||||
val plan = TaskMove.plan(
|
val plan = TaskMove.plan(
|
||||||
edited = edited,
|
edited = edited,
|
||||||
previous = current,
|
previous = current,
|
||||||
@@ -352,7 +322,11 @@ class RoomTasksDataSource @Inject constructor(
|
|||||||
return@tx
|
return@tx
|
||||||
}
|
}
|
||||||
val now = clock.now()
|
val now = clock.now()
|
||||||
val spent = spentBefore(spec, occurrenceStart)
|
// COUNT counts before EXDATE is applied (RFC 5545 §3.8.5.3).
|
||||||
|
val spent = RecurrenceExpander.expand(
|
||||||
|
spec.copy(exdate = null),
|
||||||
|
ExpansionWindow(from = anchor, until = occurrenceStart, maxOccurrences = SPLIT_COUNT_CEILING),
|
||||||
|
).size
|
||||||
val (start, due) = resolvedTimes(master, occurrenceStart)
|
val (start, due) = resolvedTimes(master, occurrenceStart)
|
||||||
tasks.update(TaskFormWriter.endedBefore(master, occurrenceStart, now, zone()))
|
tasks.update(TaskFormWriter.endedBefore(master, occurrenceStart, now, zone()))
|
||||||
|
|
||||||
@@ -375,7 +349,9 @@ class RoomTasksDataSource @Inject constructor(
|
|||||||
percentComplete = null,
|
percentComplete = null,
|
||||||
completedAt = null,
|
completedAt = null,
|
||||||
// Recurrence lines belong to the old series; everything else carries over.
|
// Recurrence lines belong to the old series; everything else carries over.
|
||||||
unknownProperties = seriesFreeText(master.unknownProperties),
|
unknownProperties = master.unknownProperties?.lines()
|
||||||
|
?.filterNot { line -> SERIES_LINES.any { line.startsWith(it, ignoreCase = true) } }
|
||||||
|
?.joinToString("\r\n")?.ifBlank { null },
|
||||||
)
|
)
|
||||||
val applied = TaskFormWriter.apply(base, form.copy(percentComplete = null), now, zone())
|
val applied = TaskFormWriter.apply(base, form.copy(percentComplete = null), now, zone())
|
||||||
val delta = applied.dtstart?.let { newStart -> start?.let { newStart - it } }
|
val delta = applied.dtstart?.let { newStart -> start?.let { newStart - it } }
|
||||||
@@ -434,12 +410,9 @@ class RoomTasksDataSource @Inject constructor(
|
|||||||
|
|
||||||
private inline fun tx(crossinline block: () -> Unit) = database.runInTransaction(Runnable { block() })
|
private inline fun tx(crossinline block: () -> Unit) = database.runInTransaction(Runnable { block() })
|
||||||
|
|
||||||
private fun seriesMaster(seriesId: Long): TaskEntity = rowAndMaster(seriesId).second
|
private fun seriesMaster(seriesId: Long): TaskEntity {
|
||||||
|
val row = tasks.entity(seriesId) ?: throw TaskWriteFailedException("series $seriesId")
|
||||||
/** [taskId]'s row, and its series' master — the row itself unless it is an override. */
|
return row.masterId?.let { tasks.entity(it) } ?: row
|
||||||
private fun rowAndMaster(taskId: Long): Pair<TaskEntity, TaskEntity> {
|
|
||||||
val row = tasks.entity(taskId) ?: throw TaskWriteFailedException("series $taskId")
|
|
||||||
return row to (row.masterId?.let { tasks.entity(it) } ?: row)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The occurrence's own times: its override's if it has one, else generated. */
|
/** The occurrence's own times: its override's if it has one, else generated. */
|
||||||
@@ -486,407 +459,62 @@ class RoomTasksDataSource @Inject constructor(
|
|||||||
|
|
||||||
override fun setReminders(taskId: Long, reminders: List<TaskReminder>) = tx {
|
override fun setReminders(taskId: Long, reminders: List<TaskReminder>) = tx {
|
||||||
if (!alarms.syncForTask(taskId, reminders)) return@tx
|
if (!alarms.syncForTask(taskId, reminders)) return@tx
|
||||||
advanced.keepAsOwnTask(taskId)
|
|
||||||
advanced.unlinkDetached(taskId)
|
|
||||||
// The reminders are part of the VTODO now, so changing them is an edit.
|
// The reminders are part of the VTODO now, so changing them is an edit.
|
||||||
val current = tasks.entity(taskId) ?: return@tx
|
val current = tasks.entity(taskId) ?: return@tx
|
||||||
tasks.update(current.copy(isDirty = true, lastModified = clock.now()))
|
tasks.update(current.copy(isDirty = true, lastModified = clock.now()))
|
||||||
writes.onWritten(setOf(current.listId))
|
writes.onWritten(setOf(current.listId))
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Reopening the copy a ticked occurrence left behind moves its series back, as in [setCompletedInstance]. */
|
override fun setCancelled(taskId: Long, cancelled: Boolean) {
|
||||||
override fun setCancelled(taskId: Long, cancelled: Boolean) = tx {
|
|
||||||
val current = tasks.entity(taskId) ?: throw TaskWriteFailedException("cancel task $taskId")
|
val current = tasks.entity(taskId) ?: throw TaskWriteFailedException("cancel task $taskId")
|
||||||
saveRow(current, TaskFormWriter.cancelled(current, cancelled, clock.now()))
|
tasks.update(TaskFormWriter.cancelled(current, cancelled, clock.now()))
|
||||||
writes.onWritten(setOf(current.listId))
|
writes.onWritten(setOf(current.listId))
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Reopening the copy a ticked occurrence left behind moves its series back, as in [setCompletedInstance]. */
|
override fun setCompleted(taskId: Long, completed: Boolean) {
|
||||||
override fun setCompleted(taskId: Long, completed: Boolean) = tx {
|
|
||||||
val current = tasks.entity(taskId) ?: throw TaskWriteFailedException("complete task $taskId")
|
val current = tasks.entity(taskId) ?: throw TaskWriteFailedException("complete task $taskId")
|
||||||
saveRow(current, TaskFormWriter.completed(current, completed, clock.now()))
|
tasks.update(TaskFormWriter.completed(current, completed, clock.now()))
|
||||||
writes.onWritten(setOf(current.listId))
|
writes.onWritten(setOf(current.listId))
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ticking a series' first open occurrence moves the series on to its next
|
* Ticking one occurrence forks a `RECURRENCE-ID` override carrying the
|
||||||
* open one and keeps a completed copy, as tasks.org and Apple Reminders do — a
|
* completion — the same model [updateInstance] writes. Writing the status onto
|
||||||
* completed `RECURRENCE-ID` override alone leaves the series showing as open
|
* the master instead would close the series: the master is what
|
||||||
* in most other clients (#137). Closed overrides between become copies too.
|
* [TaskDao.tasks] filters on, so every occurrence, past and future, would
|
||||||
* Reopening the copy while the series is still where that left it moves it
|
* leave every list at once.
|
||||||
* back. Any other occurrence forks an override carrying the completion, the
|
|
||||||
* same model [updateInstance] writes. Writing the status onto the master
|
|
||||||
* instead would close the series.
|
|
||||||
*/
|
*/
|
||||||
override fun setCompletedInstance(taskId: Long, occurrenceStart: Instant, completed: Boolean) = tx {
|
override fun setCompletedInstance(taskId: Long, occurrenceStart: Instant, completed: Boolean) =
|
||||||
closeOccurrence(taskId, occurrenceStart, completed) { TaskFormWriter.completed(it, completed, clock.now()) }
|
writeInstance(taskId, occurrenceStart, "complete") { TaskFormWriter.completed(it, completed, clock.now()) }
|
||||||
}
|
|
||||||
|
|
||||||
/** Same model as [setCompletedInstance]. */
|
/** Same override model as [setCompletedInstance]. */
|
||||||
override fun setCancelledInstance(taskId: Long, occurrenceStart: Instant, cancelled: Boolean) = tx {
|
override fun setCancelledInstance(taskId: Long, occurrenceStart: Instant, cancelled: Boolean) =
|
||||||
closeOccurrence(taskId, occurrenceStart, cancelled) { TaskFormWriter.cancelled(it, cancelled, clock.now()) }
|
writeInstance(taskId, occurrenceStart, "cancel") { TaskFormWriter.cancelled(it, cancelled, clock.now()) }
|
||||||
}
|
|
||||||
|
|
||||||
private fun closeOccurrence(taskId: Long, occurrenceStart: Instant, closing: Boolean, close: (TaskEntity) -> TaskEntity) {
|
/** Applies [write] to the override for [occurrenceStart], forking one if there is none yet. */
|
||||||
val (row, master) = rowAndMaster(taskId)
|
private fun writeInstance(
|
||||||
|
taskId: Long,
|
||||||
|
occurrenceStart: Instant,
|
||||||
|
what: String,
|
||||||
|
write: (TaskEntity) -> TaskEntity,
|
||||||
|
) {
|
||||||
|
val master = tasks.entity(taskId) ?: throw TaskWriteFailedException("$what instance $taskId")
|
||||||
|
// Not a series master — an override, or a plain task the caller handed an
|
||||||
|
// anchor for. Either way this row *is* the occurrence.
|
||||||
if (master.recurrenceSpec() == null) {
|
if (master.recurrenceSpec() == null) {
|
||||||
// A plain task, or the copy a ticked occurrence left: this row is the occurrence.
|
tasks.update(write(master))
|
||||||
saveRow(row, close(row))
|
|
||||||
writes.onWritten(setOf(row.listId))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
val override = if (row.masterId != null) row else tasks.override(master.id, occurrenceStart)
|
|
||||||
val anchor = override?.recurrenceId ?: occurrenceStart
|
|
||||||
val seriesStart = master.recurrenceAnchor ?: return
|
|
||||||
if (anchor < seriesStart && !sameSecond(anchor, seriesStart)) {
|
|
||||||
// The series has moved past it, so a tick has nothing left to close;
|
|
||||||
// a reopen goes to the copy that occurrence left.
|
|
||||||
when {
|
|
||||||
override != null -> writeInstance(master, override, anchor, close)
|
|
||||||
!closing -> copyAt(master, anchor)?.let { copy ->
|
|
||||||
saveRow(copy, close(copy))
|
|
||||||
writes.onWritten(setOf(copy.listId))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (master.isClosed) {
|
|
||||||
// A series ends with its last occurrence; reopening that one reopens the
|
|
||||||
// series. An override reopens alone while other occurrences are closed
|
|
||||||
// only through the master, which reopening it would reopen too.
|
|
||||||
val reopensSeries = !closing && (override == null || !closedThroughMaster(master, anchor))
|
|
||||||
if (reopensSeries) closeSeries(master, override, close) else writeInstance(master, override, anchor, close)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (!closing || !advance(master, anchor, override, close)) writeInstance(master, override, anchor, close)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Writes [edited] over [current]. A copy whose only change is that it
|
|
||||||
* reopens moves its series back instead; any other edit, [changedBesides]
|
|
||||||
* included, makes it a task of its own, and it no longer stands for the
|
|
||||||
* series' occurrence. So does any edit to an occurrence detached with it.
|
|
||||||
*/
|
|
||||||
private fun saveRow(current: TaskEntity, edited: TaskEntity, changedBesides: Boolean = false) {
|
|
||||||
advanced.unlinkDetached(current.id)
|
|
||||||
val record = advanced.forCopy(current.id)?.takeIf { it.undoable }
|
|
||||||
if (record != null) {
|
|
||||||
val unchanged = !changedBesides && sameApartFromState(current, edited)
|
|
||||||
if (unchanged && current.isClosed && !edited.isClosed && reopenCopy(current, edited, record)) return
|
|
||||||
if (!unchanged || !edited.isClosed) advanced.keepAsOwnTask(current.id)
|
|
||||||
}
|
|
||||||
tasks.update(edited)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Nothing a user sees changed but its state — what saving a reopened copy
|
|
||||||
* from the editor amounts to. Compared as the editor writes them back:
|
|
||||||
* trimmed, blank as none, tags normalised.
|
|
||||||
*/
|
|
||||||
private fun sameApartFromState(a: TaskEntity, b: TaskEntity): Boolean {
|
|
||||||
fun text(value: String?) = value?.trim()?.ifEmpty { null }
|
|
||||||
return text(a.title) == text(b.title) && text(a.description) == text(b.description) &&
|
|
||||||
text(a.location) == text(b.location) && text(a.url) == text(b.url) &&
|
|
||||||
a.priority == b.priority && a.dtstart == b.dtstart && a.due == b.due && a.isAllDay == b.isAllDay &&
|
|
||||||
a.listId == b.listId && a.parentId == b.parentId && a.rrule == b.rrule && a.rdate == b.rdate &&
|
|
||||||
normalizeTags(a.categories) == normalizeTags(b.categories) && a.color == b.color
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Whether an occurrence of [master] other than [except] has no override, so its state is the master's. */
|
|
||||||
private fun closedThroughMaster(master: TaskEntity, except: Instant): Boolean {
|
|
||||||
val spec = master.recurrenceSpec() ?: return false
|
|
||||||
val overridden = tasks.overrides(master.id).mapNotNull { it.recurrenceId?.let(::wholeSecond) }.toSet()
|
|
||||||
return expandFrom(spec, maxOccurrences = overridden.size + 2)
|
|
||||||
.any { !sameSecond(it, except) && wholeSecond(it) !in overridden }
|
|
||||||
}
|
|
||||||
|
|
||||||
/** [close] applied to the master — and to [override], its last occurrence — which ends the series. */
|
|
||||||
private fun closeSeries(master: TaskEntity, override: TaskEntity?, close: (TaskEntity) -> TaskEntity) {
|
|
||||||
tasks.update(close(master))
|
|
||||||
override?.let { tasks.update(close(it)) }
|
|
||||||
writes.onWritten(setOf(master.listId))
|
writes.onWritten(setOf(master.listId))
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
tasks.override(taskId, occurrenceStart)?.let {
|
||||||
* Moves [master] past [anchor] when that is its first open occurrence; false
|
tasks.update(write(it))
|
||||||
* when it is not, so the caller writes an override. Series with `RDATE`s keep
|
writes.onWritten(setOf(master.listId))
|
||||||
* the override model (anchoring on one would re-align the `RRULE`), and so do
|
return
|
||||||
* recurring subtasks, whose copies would pile up under the parent.
|
|
||||||
*/
|
|
||||||
private fun advance(master: TaskEntity, anchor: Instant, override: TaskEntity?, close: (TaskEntity) -> TaskEntity): Boolean {
|
|
||||||
val rule = master.rrule?.takeIf { it.isNotBlank() } ?: return false
|
|
||||||
if (!master.rdate.isNullOrBlank() || master.parentId != null) return false
|
|
||||||
val spec = master.recurrenceSpec() ?: return false
|
|
||||||
val overrides = tasks.overrides(master.id).associateBy { it.recurrenceId?.epochSeconds }
|
|
||||||
fun closedAt(at: Instant) = overrides[at.epochSeconds]?.isClosed == true
|
|
||||||
val leading = expandFrom(spec, maxOccurrences = overrides.values.count { it.isClosed } + 2)
|
|
||||||
val index = leading.indexOfFirst { sameSecond(it, anchor) }
|
|
||||||
if (index < 0 || leading.take(index).any { !closedAt(it) }) return false
|
|
||||||
var nextIndex = index + 1
|
|
||||||
while (nextIndex < leading.size && closedAt(leading[nextIndex])) nextIndex++
|
|
||||||
val next = leading.getOrNull(nextIndex) ?: return true.also { closeSeries(master, override, close) }
|
|
||||||
|
|
||||||
val now = clock.now()
|
|
||||||
val zone = master.timezone ?: zone()
|
|
||||||
val detached = (leading.take(index) + leading.subList(index + 1, nextIndex)).map { at ->
|
|
||||||
at to detach(overrides.getValue(at.epochSeconds), now)
|
|
||||||
}
|
}
|
||||||
// Expansion drops the anchor's sub-second part; the series keeps it.
|
|
||||||
val newAnchor = next + (spec.anchor - wholeSecond(spec.anchor))
|
|
||||||
val spent = spentBefore(spec, next)
|
|
||||||
val (start, due) = occurrenceTimes(master, newAnchor)
|
|
||||||
val ruleAfter = TaskFormWriter.remainingCount(rule, spent)
|
|
||||||
tasks.update(
|
|
||||||
master.copy(
|
|
||||||
dtstart = start,
|
|
||||||
due = due,
|
|
||||||
rrule = ruleAfter,
|
|
||||||
exdate = TaskFormWriter.valuesFrom(master.exdate, newAnchor, zone),
|
|
||||||
status = TaskStatus.NEEDS_ACTION,
|
|
||||||
percentComplete = null,
|
|
||||||
completedAt = null,
|
|
||||||
lastModified = now,
|
|
||||||
isDirty = true,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
val (reset, resetLists) = resetSubtasks(master, newAnchor, now)
|
|
||||||
val copyId = if (override != null) {
|
|
||||||
detach(override, now, close)
|
|
||||||
} else {
|
|
||||||
val (copyStart, copyDue) = occurrenceTimes(master, anchor)
|
|
||||||
val id = tasks.insert(close(asCopy(master, now).copy(dtstart = copyStart, due = copyDue)))
|
|
||||||
alarms.copyToTask(master.id, id, sameResource = false)
|
|
||||||
id
|
|
||||||
}
|
|
||||||
advanced.at(master.id, wholeSecond(anchor))?.let { advanced.delete(it.copyId) }
|
|
||||||
advanced.pruneTickedBefore(master.id, now - RECORD_HORIZON)
|
|
||||||
advanced.insert(
|
|
||||||
AdvancedOccurrenceEntity(
|
|
||||||
copyId = copyId,
|
|
||||||
masterId = master.id,
|
|
||||||
anchor = anchor,
|
|
||||||
advancedTo = newAnchor,
|
|
||||||
priorDtstart = master.dtstart,
|
|
||||||
priorDue = master.due,
|
|
||||||
priorStatus = master.status,
|
|
||||||
priorPercentComplete = master.percentComplete,
|
|
||||||
priorCompletedAt = master.completedAt,
|
|
||||||
spent = spent,
|
|
||||||
ruleAfter = ruleAfter,
|
|
||||||
droppedExdates = AdvancedOccurrenceEntity.encode(TaskFormWriter.instantsBefore(master.exdate, newAnchor, zone)),
|
|
||||||
fromOverride = override != null,
|
|
||||||
resetSubtasks = SubtaskReset.encode(reset),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
advanced.insertDetached(detached.map { (at, id) -> AdvancedDetachedEntity(copyId = copyId, anchor = at, taskId = id) })
|
|
||||||
writes.onWritten(setOf(master.listId) + resetLists)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resets what [SubtaskReset] picks under [master] for the series' next
|
|
||||||
* occurrence at [newAnchor], dated ones moved along; the lists it wrote to.
|
|
||||||
* A copy a provider tick of a recurring sub-task left, synced in, is known by
|
|
||||||
* its marker while it stays under the parent the marker names.
|
|
||||||
*/
|
|
||||||
private fun resetSubtasks(master: TaskEntity, newAnchor: Instant, now: Instant): Pair<List<ResetSubtask>, Set<Long>> {
|
|
||||||
val from = master.recurrenceAnchor?.toEpochMilliseconds()
|
|
||||||
val to = newAnchor.toEpochMilliseconds()
|
|
||||||
val shift = from?.let { SeriesShift(it, to, dateZone(master.isAllDay, master.timezone, ZoneId.of(zone()))) }
|
|
||||||
val loaded = HashMap<Long, TaskEntity>().apply { put(master.id, master) }
|
|
||||||
val reset = SubtaskReset.toReset(master.id, shift, since = from?.let { SubtaskReset.cycleStart(it, to) }) { id ->
|
|
||||||
val parentUid = loaded[id]?.uid
|
|
||||||
tasks.subtasks(id).map { row ->
|
|
||||||
val sub = row.task.also { loaded[it.id] = it }
|
|
||||||
val copy = SubtaskReset.isCopyOf(SubtaskReset.markerParentFromResidue(sub.unknownProperties), parentUid)
|
|
||||||
SubtaskNode(sub.id, sub.isRecurring || copy, sub.progress, sub.dates, sub.isAllDay, sub.lastModified?.toEpochMilliseconds())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val lists = reset.mapNotNull { entry ->
|
|
||||||
loaded[entry.id]?.also { tasks.update(it.withProgress(SubtaskState.FRESH, entry.dates, now)) }?.listId
|
|
||||||
}
|
|
||||||
return reset to lists.toSet()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** What [resetSubtasks] reset for [record], back as it was where nothing changed it since. */
|
|
||||||
private fun restoreSubtasks(record: AdvancedOccurrenceEntity, now: Instant): Set<Long> {
|
|
||||||
val entries = SubtaskReset.decode(record.resetSubtasks)
|
|
||||||
val current = entries.mapNotNull { entry -> tasks.entity(entry.id)?.takeUnless { it.isDeleted } }.associateBy { it.id }
|
|
||||||
val outcome = SubtaskReset.toRestore(entries) { id -> current[id]?.let { SubtaskNow(it.progress, it.dates, it.isAllDay) } }
|
|
||||||
if (outcome.changed.isNotEmpty()) Log.i(TAG, "Sub-tasks ${outcome.changed} changed since the reset and keep that")
|
|
||||||
return outcome.restore.mapNotNull { back ->
|
|
||||||
current[back.id]?.also { tasks.update(it.withProgress(back.state, back.dates, now)) }?.listId
|
|
||||||
}.toSet()
|
|
||||||
}
|
|
||||||
|
|
||||||
private val TaskEntity.progress get() = SubtaskState(status, percentComplete, completedAt?.toEpochMilliseconds())
|
|
||||||
|
|
||||||
private val TaskEntity.dates get() = SubtaskDates(dtstart?.toEpochMilliseconds(), due?.toEpochMilliseconds())
|
|
||||||
|
|
||||||
/** [state] and [dates] onto the row, each only where non-null. */
|
|
||||||
private fun TaskEntity.withProgress(state: SubtaskState?, dates: SubtaskDates?, now: Instant) = copy(
|
|
||||||
status = state?.status ?: status,
|
|
||||||
percentComplete = if (state == null) percentComplete else state.percent,
|
|
||||||
completedAt = if (state == null) completedAt else state.completedAt?.let(Instant::fromEpochMilliseconds),
|
|
||||||
dtstart = if (dates == null) dtstart else dates.start?.let(Instant::fromEpochMilliseconds),
|
|
||||||
due = if (dates == null) due else dates.due?.let(Instant::fromEpochMilliseconds),
|
|
||||||
lastModified = now,
|
|
||||||
isDirty = true,
|
|
||||||
)
|
|
||||||
|
|
||||||
/** Occurrences `COUNT` has spent before [cut]: counted before `EXDATE` (RFC 5545 §3.8.5.3). */
|
|
||||||
private fun spentBefore(spec: RecurrenceSpec, cut: Instant): Int = RecurrenceExpander.expand(
|
|
||||||
spec.copy(exdate = null),
|
|
||||||
ExpansionWindow(from = wholeSecond(spec.anchor), until = cut, maxOccurrences = SPLIT_COUNT_CEILING),
|
|
||||||
).size
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Turns the override [row] into a task of its own, in place so its id keeps
|
|
||||||
* working: a new UID, unlinked from the series, a resource of its own — and
|
|
||||||
* so its alarms are fresh copies, not the series' ones.
|
|
||||||
*/
|
|
||||||
private fun detach(row: TaskEntity, now: Instant, close: (TaskEntity) -> TaskEntity = { it }): Long {
|
|
||||||
tasks.update(close(asCopy(row, now).copy(id = row.id)))
|
|
||||||
refreshAlarms(row.id)
|
|
||||||
return row.id
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun refreshAlarms(taskId: Long) {
|
|
||||||
val current = alarms.forTask(taskId)
|
|
||||||
alarms.deleteForTask(taskId)
|
|
||||||
current.forEach { alarms.insert(it.freshCopy(taskId)) }
|
|
||||||
}
|
|
||||||
|
|
||||||
/** [source] as a standalone task: no series fields, never uploaded. */
|
|
||||||
private fun asCopy(source: TaskEntity, now: Instant): TaskEntity = source.copy(
|
|
||||||
id = 0,
|
|
||||||
uid = UUID.randomUUID().toString(),
|
|
||||||
masterId = null,
|
|
||||||
recurrenceId = null,
|
|
||||||
href = null,
|
|
||||||
etag = null,
|
|
||||||
rrule = null,
|
|
||||||
rdate = null,
|
|
||||||
exdate = null,
|
|
||||||
createdAt = now,
|
|
||||||
sequence = 0,
|
|
||||||
isDeleted = false,
|
|
||||||
isDirty = true,
|
|
||||||
unknownProperties = seriesFreeText(source.unknownProperties),
|
|
||||||
)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Undoes [advance] for the copy [row] while the series still sits where it
|
|
||||||
* moved it under the same rule, and the copy is still just that — same list,
|
|
||||||
* nothing filed under it. The anchor goes back, `COUNT` gets back what it
|
|
||||||
* spent, and the dropped `EXDATE`s return in the list's own shape; any other
|
|
||||||
* edit made since stays. The occurrence takes [reopened]'s state: as a plain
|
|
||||||
* occurrence again, or as an override where that state is its own. The
|
|
||||||
* occurrences detached with it become overrides again, or are excluded where
|
|
||||||
* their row is gone or has a life of its own. False when it cannot, so the
|
|
||||||
* caller reopens the copy as a task of its own.
|
|
||||||
*/
|
|
||||||
private fun reopenCopy(row: TaskEntity, reopened: TaskEntity, record: AdvancedOccurrenceEntity): Boolean {
|
|
||||||
val master = tasks.entity(record.masterId)?.takeIf {
|
|
||||||
!it.isDeleted && !it.isClosed && row.listId == it.listId && sameRule(it.rrule, record.ruleAfter) &&
|
|
||||||
it.recurrenceAnchor?.let { a -> sameSecond(a, record.advancedTo) } == true
|
|
||||||
}
|
|
||||||
if (master == null || tasks.subtasks(row.id).isNotEmpty()) return false
|
|
||||||
val now = clock.now()
|
|
||||||
val zone = master.timezone ?: zone()
|
|
||||||
val synced = lists.entity(master.listId)?.accountId != null
|
|
||||||
val (start, due) = occurrenceTimes(master, record.priorDtstart ?: record.priorDue ?: record.anchor)
|
|
||||||
var back = master.copy(
|
|
||||||
dtstart = start,
|
|
||||||
due = due,
|
|
||||||
rrule = master.rrule?.let { TaskFormWriter.remainingCount(it, -record.spent) },
|
|
||||||
status = if (master.status == TaskStatus.NEEDS_ACTION) record.priorStatus else master.status,
|
|
||||||
percentComplete = master.percentComplete ?: record.priorPercentComplete,
|
|
||||||
completedAt = master.completedAt ?: record.priorCompletedAt,
|
|
||||||
lastModified = now,
|
|
||||||
isDirty = true,
|
|
||||||
)
|
|
||||||
record.dropped.forEach { back = TaskFormWriter.excepting(back, it, now, zone, dirty = synced) }
|
|
||||||
// A detached row given a parent or subtasks since has a life of its own, and stays out.
|
|
||||||
fun returns(task: TaskEntity?) = task != null && !task.isDeleted && task.listId == master.listId &&
|
|
||||||
task.parentId == master.parentId && tasks.subtasks(task.id).isEmpty()
|
|
||||||
val detached = advanced.detachedFor(row.id).map { it.anchor to it.taskId?.let(tasks::entity) }
|
|
||||||
detached.forEach { (at, task) -> if (!returns(task)) back = TaskFormWriter.excepting(back, at, now, zone, dirty = synced) }
|
|
||||||
tasks.update(back)
|
|
||||||
detached.forEach { (at, task) -> if (returns(task)) toOverride(task!!, back, at, now) }
|
|
||||||
advanced.delete(row.id)
|
|
||||||
val plain = reopened.status == TaskStatus.NEEDS_ACTION && reopened.percentComplete == null
|
|
||||||
if (record.fromOverride || !plain) toOverride(reopened, back, record.anchor, now)
|
|
||||||
else deleteTask(row.id)
|
|
||||||
writes.onWritten(setOf(master.listId) + restoreSubtasks(record, now))
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The same `RRULE` however a server re-serialised it: parts in any order and case. */
|
|
||||||
private fun sameRule(a: String?, b: String?): Boolean {
|
|
||||||
fun parts(rule: String?) = rule?.trim()?.removePrefix("RRULE:")?.split(';')
|
|
||||||
?.map { it.trim().uppercase() }?.filter { it.isNotEmpty() }?.toSet()
|
|
||||||
return parts(a) == parts(b)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** [row], a detached occurrence, back as [master]'s override for [anchor]. */
|
|
||||||
private fun toOverride(row: TaskEntity, master: TaskEntity, anchor: Instant, now: Instant) {
|
|
||||||
val back = row.copy(
|
|
||||||
uid = master.uid,
|
|
||||||
masterId = master.id,
|
|
||||||
recurrenceId = anchor,
|
|
||||||
href = null,
|
|
||||||
etag = null,
|
|
||||||
isDirty = true,
|
|
||||||
lastModified = now,
|
|
||||||
unknownProperties = seriesFreeText(row.unknownProperties),
|
|
||||||
)
|
|
||||||
if (row.href == null) {
|
|
||||||
tasks.update(back)
|
|
||||||
refreshAlarms(row.id)
|
|
||||||
} else {
|
|
||||||
// Already uploaded as a resource of its own: that one goes, a fresh override comes.
|
|
||||||
val id = tasks.insert(back.copy(id = 0))
|
|
||||||
alarms.copyToTask(row.id, id, sameResource = false)
|
|
||||||
deleteTask(row.id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The copy [advance] left for [master]'s occurrence at [anchor], if it is still there. */
|
|
||||||
private fun copyAt(master: TaskEntity, anchor: Instant): TaskEntity? =
|
|
||||||
advanced.at(master.id, wholeSecond(anchor))?.let { tasks.entity(it.copyId) }?.takeUnless { it.isDeleted }
|
|
||||||
|
|
||||||
/** The series' occurrences from its anchor on, at most [maxOccurrences]. */
|
|
||||||
private fun expandFrom(spec: RecurrenceSpec, maxOccurrences: Int): List<Instant> {
|
|
||||||
val from = wholeSecond(spec.anchor)
|
|
||||||
return RecurrenceExpander.expand(spec, ExpansionWindow(from = from, until = from + SERIES_LOOKAHEAD, maxOccurrences = maxOccurrences))
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The residue without the series' own lines, as a new resource must not
|
|
||||||
* carry them. Lines inside a nested component (a `VALARM`'s `UID`) are its
|
|
||||||
* own and stay.
|
|
||||||
*/
|
|
||||||
private fun seriesFreeText(unknown: String?): String? {
|
|
||||||
var depth = 0
|
|
||||||
return unknown?.lines()?.filter { line ->
|
|
||||||
when {
|
|
||||||
line.startsWith("BEGIN:", ignoreCase = true) -> { depth++; true }
|
|
||||||
line.startsWith("END:", ignoreCase = true) -> { depth--; true }
|
|
||||||
else -> depth > 0 || (line.isNotBlank() && SERIES_LINES.none { line.startsWith(it, ignoreCase = true) })
|
|
||||||
}
|
|
||||||
}?.joinToString("\r\n")?.ifBlank { null }
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Applies [write] to [override], or to a new one forked from [master] for [occurrenceStart]. */
|
|
||||||
private fun writeInstance(master: TaskEntity, override: TaskEntity?, occurrenceStart: Instant, write: (TaskEntity) -> TaskEntity) {
|
|
||||||
if (override != null) {
|
|
||||||
tasks.update(write(override))
|
|
||||||
} else {
|
|
||||||
val (start, due) = occurrenceTimes(master, occurrenceStart)
|
val (start, due) = occurrenceTimes(master, occurrenceStart)
|
||||||
val id = tasks.insert(write(newOverride(master, master.id, occurrenceStart, start, due)))
|
val id = tasks.insert(write(newOverride(master, taskId, occurrenceStart, start, due)))
|
||||||
alarms.copyToTask(master.id, id, sameResource = true)
|
alarms.copyToTask(taskId, id, sameResource = true)
|
||||||
}
|
|
||||||
writes.onWritten(setOf(master.listId))
|
writes.onWritten(setOf(master.listId))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -979,7 +607,7 @@ class RoomTasksDataSource @Inject constructor(
|
|||||||
if (lists.exists(edited.listId) == 0) throw TaskWriteFailedException("move task: no list ${edited.listId}")
|
if (lists.exists(edited.listId) == 0) throw TaskWriteFailedException("move task: no list ${edited.listId}")
|
||||||
move(current, edited)
|
move(current, edited)
|
||||||
}
|
}
|
||||||
else -> saveRow(current, edited)
|
else -> tasks.update(edited)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
writes.onWritten(setOf(current.listId, edited.listId))
|
writes.onWritten(setOf(current.listId, edited.listId))
|
||||||
@@ -1022,12 +650,8 @@ class RoomTasksDataSource @Inject constructor(
|
|||||||
|
|
||||||
// --- observation ----------------------------------------------------------
|
// --- observation ----------------------------------------------------------
|
||||||
|
|
||||||
override fun registerObserver(onChange: () -> Unit): AutoCloseable = observe(OBSERVED_TABLES, onChange)
|
override fun registerObserver(onChange: () -> Unit): AutoCloseable {
|
||||||
|
val observer = object : InvalidationTracker.Observer(OBSERVED_TABLES) {
|
||||||
override fun registerTaskObserver(onChange: () -> Unit): AutoCloseable = observe(TASK_TABLES, onChange)
|
|
||||||
|
|
||||||
private fun observe(tables: Array<String>, onChange: () -> Unit): AutoCloseable {
|
|
||||||
val observer = object : InvalidationTracker.Observer(tables) {
|
|
||||||
override fun onInvalidated(tables: Set<String>) = onChange()
|
override fun onInvalidated(tables: Set<String>) = onChange()
|
||||||
}
|
}
|
||||||
database.invalidationTracker.addObserver(observer)
|
database.invalidationTracker.addObserver(observer)
|
||||||
|
|||||||
@@ -199,12 +199,4 @@ interface TaskDao {
|
|||||||
*/
|
*/
|
||||||
@Query("UPDATE tasks SET href = :href, etag = :etag, is_dirty = 0 WHERE id IN (:taskIds)")
|
@Query("UPDATE tasks SET href = :href, etag = :etag, is_dirty = 0 WHERE id IN (:taskIds)")
|
||||||
fun markSynced(taskIds: List<Long>, href: String?, etag: String?): Int
|
fun markSynced(taskIds: List<Long>, href: String?, etag: String?): Int
|
||||||
|
|
||||||
/** Records the `SEQUENCE` an upload sent, never lowering it. */
|
|
||||||
@Query("UPDATE tasks SET sequence = :sequence WHERE id = :taskId AND sequence < :sequence")
|
|
||||||
fun raiseSequence(taskId: Long, sequence: Int)
|
|
||||||
|
|
||||||
/** Sets `is_dirty` again on [taskId] when it was written after [seen], its `last_modified` when uploaded. */
|
|
||||||
@Query("UPDATE tasks SET is_dirty = 1 WHERE id = :taskId AND last_modified IS NOT :seen")
|
|
||||||
fun dirtyIfChangedSince(taskId: Long, seen: Instant?)
|
|
||||||
}
|
}
|
||||||
@@ -120,25 +120,18 @@ object TaskFormWriter {
|
|||||||
fun valuesBefore(values: String?, cut: Instant, zone: String): String? =
|
fun valuesBefore(values: String?, cut: Instant, zone: String): String? =
|
||||||
mapValues(values, zone) { it.takeIf { at -> at < cut } }
|
mapValues(values, zone) { it.takeIf { at -> at < cut } }
|
||||||
|
|
||||||
/** The instants of an `EXDATE`/`RDATE` list before [cut]; values it cannot read are left out. */
|
|
||||||
fun instantsBefore(values: String?, cut: Instant, zone: String): List<Instant> =
|
|
||||||
parsed(values, zone).mapNotNull { it.second }.filter { it < cut }
|
|
||||||
|
|
||||||
/** The values of an `EXDATE`/`RDATE` list at or after [cut]. */
|
/** The values of an `EXDATE`/`RDATE` list at or after [cut]. */
|
||||||
fun valuesFrom(values: String?, cut: Instant, zone: String): String? =
|
fun valuesFrom(values: String?, cut: Instant, zone: String): String? =
|
||||||
mapValues(values, zone) { it.takeIf { at -> at >= cut } }
|
mapValues(values, zone) { it.takeIf { at -> at >= cut } }
|
||||||
|
|
||||||
private fun mapValues(values: String?, zone: String, map: (Instant) -> Instant?): String? {
|
private fun mapValues(values: String?, zone: String, map: (Instant) -> Instant?): String? {
|
||||||
if (values == null) return null
|
val list = values?.split(',')?.map(String::trim)?.filter(String::isNotEmpty) ?: return values
|
||||||
return parsed(values, zone).mapNotNull { (raw, at) ->
|
return list.mapNotNull { raw ->
|
||||||
if (at == null) raw else map(at)?.let { writeValueLike(raw, it, zone) }
|
val at = readValue(raw, zone) ?: return@mapNotNull raw
|
||||||
|
map(at)?.let { writeValueLike(raw, it, zone) }
|
||||||
}.joinToString(",").ifEmpty { null }
|
}.joinToString(",").ifEmpty { null }
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Each value of an `EXDATE`/`RDATE` list with its instant, or null where it cannot be read. */
|
|
||||||
private fun parsed(values: String?, zone: String): List<Pair<String, Instant?>> =
|
|
||||||
values?.split(',')?.map(String::trim)?.filter(String::isNotEmpty)?.map { it to readValue(it, zone) }.orEmpty()
|
|
||||||
|
|
||||||
private fun readValue(raw: String, zone: String): Instant? = runCatching {
|
private fun readValue(raw: String, zone: String): Instant? = runCatching {
|
||||||
val z = java.time.ZoneId.of(zone)
|
val z = java.time.ZoneId.of(zone)
|
||||||
val instant = when {
|
val instant = when {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ interface TaskListDao {
|
|||||||
"""
|
"""
|
||||||
SELECT l.*, a.display_name AS account_display_name, a.label AS account_label
|
SELECT l.*, a.display_name AS account_display_name, a.label AS account_label
|
||||||
FROM task_lists l LEFT JOIN accounts a ON a.id = l.account_id
|
FROM task_lists l LEFT JOIN accounts a ON a.id = l.account_id
|
||||||
ORDER BY a.display_name COLLATE NOCASE, l.sort_order, l.name COLLATE NOCASE, l.name
|
ORDER BY a.display_name, l.sort_order, l.name
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
fun lists(): List<TaskListRow>
|
fun lists(): List<TaskListRow>
|
||||||
@@ -32,10 +32,6 @@ interface TaskListDao {
|
|||||||
)
|
)
|
||||||
fun list(listId: Long): TaskListRow?
|
fun list(listId: Long): TaskListRow?
|
||||||
|
|
||||||
/** The highest position among device-only lists, -1 when there are none. */
|
|
||||||
@Query("SELECT COALESCE(MAX(sort_order), -1) FROM task_lists WHERE account_id IS NULL")
|
|
||||||
fun lastLocalSortOrder(): Int
|
|
||||||
|
|
||||||
@Query("SELECT * FROM task_lists WHERE id = :listId")
|
@Query("SELECT * FROM task_lists WHERE id = :listId")
|
||||||
fun entity(listId: Long): TaskListEntity?
|
fun entity(listId: Long): TaskListEntity?
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import java.util.UUID
|
|||||||
import kotlin.time.Instant
|
import kotlin.time.Instant
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Agendula's own task store. Six tables, designed from
|
* Agendula's own task store. Four tables, designed from
|
||||||
* what the app actually reads and writes plus RFC 5545's `VTODO`.
|
* what the app actually reads and writes plus RFC 5545's `VTODO`.
|
||||||
*
|
*
|
||||||
* Schemas are exported to `app/schemas/` and committed, so a future version can
|
* Schemas are exported to `app/schemas/` and committed, so a future version can
|
||||||
@@ -21,10 +21,8 @@ import kotlin.time.Instant
|
|||||||
TaskListEntity::class,
|
TaskListEntity::class,
|
||||||
TaskEntity::class,
|
TaskEntity::class,
|
||||||
TaskAlarmEntity::class,
|
TaskAlarmEntity::class,
|
||||||
AdvancedOccurrenceEntity::class,
|
|
||||||
AdvancedDetachedEntity::class,
|
|
||||||
],
|
],
|
||||||
version = 6,
|
version = 4,
|
||||||
exportSchema = true,
|
exportSchema = true,
|
||||||
)
|
)
|
||||||
@TypeConverters(Converters::class)
|
@TypeConverters(Converters::class)
|
||||||
@@ -33,7 +31,6 @@ abstract class TasksDatabase : RoomDatabase() {
|
|||||||
abstract fun tasks(): TaskDao
|
abstract fun tasks(): TaskDao
|
||||||
abstract fun alarms(): TaskAlarmDao
|
abstract fun alarms(): TaskAlarmDao
|
||||||
abstract fun accounts(): AccountDao
|
abstract fun accounts(): AccountDao
|
||||||
abstract fun advancedOccurrences(): AdvancedOccurrenceDao
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val NAME = "agendula-tasks.db"
|
const val NAME = "agendula-tasks.db"
|
||||||
@@ -183,33 +180,5 @@ abstract class TasksDatabase : RoomDatabase() {
|
|||||||
db.execSQL("ALTER TABLE accounts ADD COLUMN label TEXT")
|
db.execSQL("ALTER TABLE accounts ADD COLUMN label TEXT")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** v5 remembers how ticking an occurrence moved its series, so reopening it can move it back. */
|
|
||||||
val MIGRATION_4_5 = object : Migration(4, 5) {
|
|
||||||
override fun migrate(db: SupportSQLiteDatabase) {
|
|
||||||
db.execSQL(
|
|
||||||
"CREATE TABLE IF NOT EXISTS `advanced_occurrences` (`copy_id` INTEGER NOT NULL, `master_id` INTEGER NOT NULL, `anchor` INTEGER NOT NULL, `advanced_to` INTEGER NOT NULL, `prior_dtstart` INTEGER, `prior_due` INTEGER, `prior_status` INTEGER NOT NULL, `prior_percent_complete` INTEGER, `prior_completed_at` INTEGER, `spent` INTEGER NOT NULL, `rule_after` TEXT, `dropped_exdates` TEXT NOT NULL DEFAULT '', `from_override` INTEGER NOT NULL, `undoable` INTEGER NOT NULL DEFAULT 1, `settled` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`copy_id`), FOREIGN KEY(`copy_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`master_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
|
|
||||||
)
|
|
||||||
db.execSQL(
|
|
||||||
"CREATE INDEX IF NOT EXISTS `index_advanced_occurrences_master_id_anchor` ON `advanced_occurrences` (`master_id`, `anchor`)",
|
|
||||||
)
|
|
||||||
db.execSQL(
|
|
||||||
"CREATE TABLE IF NOT EXISTS `advanced_detached` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `copy_id` INTEGER NOT NULL, `anchor` INTEGER NOT NULL, `task_id` INTEGER, FOREIGN KEY(`copy_id`) REFERENCES `advanced_occurrences`(`copy_id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`task_id`) REFERENCES `tasks`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )",
|
|
||||||
)
|
|
||||||
db.execSQL(
|
|
||||||
"CREATE INDEX IF NOT EXISTS `index_advanced_detached_copy_id` ON `advanced_detached` (`copy_id`)",
|
|
||||||
)
|
|
||||||
db.execSQL(
|
|
||||||
"CREATE INDEX IF NOT EXISTS `index_advanced_detached_task_id` ON `advanced_detached` (`task_id`)",
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** v6 remembers which sub-tasks a moved series reset, so moving it back restores them (#160). */
|
|
||||||
val MIGRATION_5_6 = object : Migration(5, 6) {
|
|
||||||
override fun migrate(db: SupportSQLiteDatabase) {
|
|
||||||
db.execSQL("ALTER TABLE advanced_occurrences ADD COLUMN `reset_subtasks` TEXT NOT NULL DEFAULT ''")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -159,9 +159,7 @@ class ExternalImport @Inject constructor(
|
|||||||
val taskDao = database.tasks()
|
val taskDao = database.tasks()
|
||||||
val alarmDao = database.alarms()
|
val alarmDao = database.alarms()
|
||||||
|
|
||||||
// After the device-only lists already there, which the copies join.
|
val listIds = snapshot.lists.associate { list ->
|
||||||
val after = listDao.lastLocalSortOrder() + 1
|
|
||||||
val listIds = snapshot.lists.withIndex().associate { (position, list) ->
|
|
||||||
list.id to listDao.insert(
|
list.id to listDao.insert(
|
||||||
TaskListEntity(
|
TaskListEntity(
|
||||||
name = list.name,
|
name = list.name,
|
||||||
@@ -170,7 +168,6 @@ class ExternalImport @Inject constructor(
|
|||||||
isVisible = list.isVisible,
|
isVisible = list.isVisible,
|
||||||
isSynced = false,
|
isSynced = false,
|
||||||
owner = list.owner,
|
owner = list.owner,
|
||||||
sortOrder = after + position,
|
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,9 +37,6 @@ data class TaskList(
|
|||||||
|
|
||||||
enum class TaskStatus { NEEDS_ACTION, IN_PROCESS, COMPLETED, CANCELLED }
|
enum class TaskStatus { NEEDS_ACTION, IN_PROCESS, COMPLETED, CANCELLED }
|
||||||
|
|
||||||
/** Completed or cancelled. */
|
|
||||||
val TaskStatus.isClosed: Boolean get() = this == TaskStatus.COMPLETED || this == TaskStatus.CANCELLED
|
|
||||||
|
|
||||||
/** iCalendar priority, bucketed for the UI. */
|
/** iCalendar priority, bucketed for the UI. */
|
||||||
enum class Priority { NONE, LOW, MEDIUM, HIGH }
|
enum class Priority { NONE, LOW, MEDIUM, HIGH }
|
||||||
|
|
||||||
@@ -114,7 +111,7 @@ data class Task(
|
|||||||
val isOccurrence: Boolean get() = seriesId != null && occurrenceStart != null
|
val isOccurrence: Boolean get() = seriesId != null && occurrenceStart != null
|
||||||
|
|
||||||
val isCompleted: Boolean get() = status == TaskStatus.COMPLETED
|
val isCompleted: Boolean get() = status == TaskStatus.COMPLETED
|
||||||
val isClosed: Boolean get() = status.isClosed
|
val isClosed: Boolean get() = status == TaskStatus.COMPLETED || status == TaskStatus.CANCELLED
|
||||||
val isSubtask: Boolean get() = parentId != null && parentId > 0
|
val isSubtask: Boolean get() = parentId != null && parentId > 0
|
||||||
/** The task's own colour if set, else the list colour. */
|
/** The task's own colour if set, else the list colour. */
|
||||||
val effectiveColor: Int get() = taskColor ?: listColor
|
val effectiveColor: Int get() = taskColor ?: listColor
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ fun dueWindowOf(
|
|||||||
todayEnd: Instant,
|
todayEnd: Instant,
|
||||||
zone: ZoneId = ZoneId.systemDefault(),
|
zone: ZoneId = ZoneId.systemDefault(),
|
||||||
): DueWindow {
|
): DueWindow {
|
||||||
val due = task.wallClock(task.due, zone)
|
val due = task.due?.let { if (task.isAllDay) it.rebasedForAllDay(allDay = false, zone = zone) else it }
|
||||||
return when {
|
return when {
|
||||||
due == null -> DueWindow.NO_DATE
|
due == null -> DueWindow.NO_DATE
|
||||||
due < todayStart -> DueWindow.OVERDUE
|
due < todayStart -> DueWindow.OVERDUE
|
||||||
@@ -68,10 +68,6 @@ fun dueWindowOf(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** [at], one of this task's dates, as a local instant: an all-day date is read as its calendar date. */
|
|
||||||
fun Task.wallClock(at: Instant?, zone: ZoneId = ZoneId.systemDefault()): Instant? =
|
|
||||||
at?.let { if (isAllDay) it.rebasedForAllDay(allDay = false, zone = zone) else it }
|
|
||||||
|
|
||||||
/** What a task created from a [SavedFilter] starts with, so it lands in that filter. */
|
/** What a task created from a [SavedFilter] starts with, so it lands in that filter. */
|
||||||
data class NewTaskPreset(
|
data class NewTaskPreset(
|
||||||
val listIds: Set<Long> = emptySet(),
|
val listIds: Set<Long> = emptySet(),
|
||||||
|
|||||||
@@ -1,13 +1,8 @@
|
|||||||
package de.jeanlucmakiola.agendula.domain
|
package de.jeanlucmakiola.agendula.domain
|
||||||
|
|
||||||
import java.time.ZoneId
|
|
||||||
import kotlin.time.Instant
|
import kotlin.time.Instant
|
||||||
|
|
||||||
/**
|
/** The built-in "smart" lists, computed from due dates rather than membership. */
|
||||||
* The built-in "smart" lists, computed from dates rather than membership. All
|
|
||||||
* but [COMPLETED] hold open tasks, except [TODAY], which also keeps the ones
|
|
||||||
* completed today (see [TaskFiltering.isToday]).
|
|
||||||
*/
|
|
||||||
enum class SmartList { ALL, TODAY, UPCOMING, OVERDUE, NO_DATE, COMPLETED }
|
enum class SmartList { ALL, TODAY, UPCOMING, OVERDUE, NO_DATE, COMPLETED }
|
||||||
|
|
||||||
/** What a task screen is showing: one real list, a smart list, or a tag. */
|
/** What a task screen is showing: one real list, a smart list, or a tag. */
|
||||||
@@ -45,20 +40,6 @@ object TaskFiltering {
|
|||||||
is TaskFilter.Saved -> saved?.takeIf { it.id == filter.id }?.matches(task, todayStart, todayEnd) ?: false
|
is TaskFilter.Saved -> saved?.takeIf { it.id == filter.id }?.matches(task, todayStart, todayEnd) ?: false
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Whether [task] belongs in Today. An open task does when it is due today, or
|
|
||||||
* starts today without being overdue; a completed one when it was completed today.
|
|
||||||
*/
|
|
||||||
fun isToday(task: Task, todayStart: Instant, todayEnd: Instant, zone: ZoneId = ZoneId.systemDefault()): Boolean {
|
|
||||||
fun inToday(at: Instant?) = at != null && at >= todayStart && at < todayEnd
|
|
||||||
if (task.isClosed) return task.isCompleted && inToday(task.completedAt)
|
|
||||||
return when (dueWindowOf(task, todayStart, todayEnd, zone)) {
|
|
||||||
DueWindow.TODAY -> true
|
|
||||||
DueWindow.OVERDUE -> false
|
|
||||||
DueWindow.UPCOMING, DueWindow.NO_DATE -> inToday(task.wallClock(task.start, zone))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Whether [task] carries every one of [tags]; an empty set matches everything. */
|
/** Whether [task] carries every one of [tags]; an empty set matches everything. */
|
||||||
fun hasAllTags(task: Task, tags: Set<String>): Boolean = task.tags.containsAll(tags)
|
fun hasAllTags(task: Task, tags: Set<String>): Boolean = task.tags.containsAll(tags)
|
||||||
|
|
||||||
@@ -68,7 +49,7 @@ object TaskFiltering {
|
|||||||
SmartList.ALL -> !task.isClosed
|
SmartList.ALL -> !task.isClosed
|
||||||
SmartList.NO_DATE -> !task.isClosed && dueWindowOf(task, todayStart, todayEnd) == DueWindow.NO_DATE
|
SmartList.NO_DATE -> !task.isClosed && dueWindowOf(task, todayStart, todayEnd) == DueWindow.NO_DATE
|
||||||
SmartList.OVERDUE -> !task.isClosed && dueWindowOf(task, todayStart, todayEnd) == DueWindow.OVERDUE
|
SmartList.OVERDUE -> !task.isClosed && dueWindowOf(task, todayStart, todayEnd) == DueWindow.OVERDUE
|
||||||
SmartList.TODAY -> isToday(task, todayStart, todayEnd)
|
SmartList.TODAY -> !task.isClosed && dueWindowOf(task, todayStart, todayEnd) == DueWindow.TODAY
|
||||||
SmartList.UPCOMING -> !task.isClosed && dueWindowOf(task, todayStart, todayEnd) == DueWindow.UPCOMING
|
SmartList.UPCOMING -> !task.isClosed && dueWindowOf(task, todayStart, todayEnd) == DueWindow.UPCOMING
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,22 +16,19 @@ data class SectionedTasks(val section: TaskSection, val tasks: List<Task>)
|
|||||||
*
|
*
|
||||||
* [todayStart] is local midnight today and [todayEnd] local midnight tomorrow
|
* [todayStart] is local midnight today and [todayEnd] local midnight tomorrow
|
||||||
* (compute with [DayWindow]). Only non-empty sections are returned, in the
|
* (compute with [DayWindow]). Only non-empty sections are returned, in the
|
||||||
* fixed order Overdue → Today → Upcoming → No date → Completed. In the Today
|
* fixed order Overdue → Today → Upcoming → No date → Completed.
|
||||||
* list ([todayList]) every open task sits under Today, as it may be there by its
|
|
||||||
* start date alone.
|
|
||||||
*/
|
*/
|
||||||
object TaskSections {
|
object TaskSections {
|
||||||
|
|
||||||
fun of(tasks: List<Task>, todayStart: Instant, todayEnd: Instant, todayList: Boolean = false): List<SectionedTasks> {
|
fun of(tasks: List<Task>, todayStart: Instant, todayEnd: Instant): List<SectionedTasks> {
|
||||||
val bySection = tasks.groupBy { sectionOf(it, todayStart, todayEnd, todayList) }
|
val bySection = tasks.groupBy { sectionOf(it, todayStart, todayEnd) }
|
||||||
return TaskSection.entries.mapNotNull { section ->
|
return TaskSection.entries.mapNotNull { section ->
|
||||||
bySection[section]?.takeIf { it.isNotEmpty() }?.let { SectionedTasks(section, it) }
|
bySection[section]?.takeIf { it.isNotEmpty() }?.let { SectionedTasks(section, it) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun sectionOf(task: Task, todayStart: Instant, todayEnd: Instant, todayList: Boolean = false): TaskSection {
|
fun sectionOf(task: Task, todayStart: Instant, todayEnd: Instant): TaskSection {
|
||||||
if (task.isCompleted) return TaskSection.COMPLETED
|
if (task.isCompleted) return TaskSection.COMPLETED
|
||||||
if (todayList) return TaskSection.TODAY
|
|
||||||
return when (dueWindowOf(task, todayStart, todayEnd)) {
|
return when (dueWindowOf(task, todayStart, todayEnd)) {
|
||||||
DueWindow.OVERDUE -> TaskSection.OVERDUE
|
DueWindow.OVERDUE -> TaskSection.OVERDUE
|
||||||
DueWindow.TODAY -> TaskSection.TODAY
|
DueWindow.TODAY -> TaskSection.TODAY
|
||||||
|
|||||||
+5
-12
@@ -12,16 +12,6 @@ import kotlin.time.Instant
|
|||||||
private const val MILLIS_PER_SECOND = 1000L
|
private const val MILLIS_PER_SECOND = 1000L
|
||||||
private const val MILLIS_PER_DAY = 24L * 60 * 60 * 1000
|
private const val MILLIS_PER_DAY = 24L * 60 * 60 * 1000
|
||||||
|
|
||||||
/**
|
|
||||||
* The zone a task's dates are read in: UTC for an all-day one, whose dates are
|
|
||||||
* midnights there; else its [timeZone], or [floating] when it has none or an
|
|
||||||
* unknown one.
|
|
||||||
*/
|
|
||||||
fun dateZone(isAllDay: Boolean, timeZone: String?, floating: ZoneId = ZoneId.systemDefault()): ZoneId {
|
|
||||||
if (isAllDay) return ZoneId.of("UTC")
|
|
||||||
return timeZone?.let { runCatching { ZoneId.of(it) }.getOrNull() } ?: floating
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The rule set of one task series, as stored. All strings are raw iCalendar values. */
|
/** The rule set of one task series, as stored. All strings are raw iCalendar values. */
|
||||||
data class RecurrenceSpec(
|
data class RecurrenceSpec(
|
||||||
val rrule: String?,
|
val rrule: String?,
|
||||||
@@ -143,8 +133,11 @@ object RecurrenceExpander {
|
|||||||
return occurrences.indices.map { it - current }
|
return occurrences.indices.map { it - current }
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun zoneOf(spec: RecurrenceSpec, floatingZone: ZoneId): TimeZone =
|
private fun zoneOf(spec: RecurrenceSpec, floatingZone: ZoneId): TimeZone {
|
||||||
TimeZone.getTimeZone(dateZone(spec.isAllDay, spec.timeZone, floatingZone))
|
if (spec.isAllDay) return TimeZone.getTimeZone(ZoneId.of("UTC"))
|
||||||
|
val stored = spec.timeZone?.let { runCatching { ZoneId.of(it) }.getOrNull() }
|
||||||
|
return TimeZone.getTimeZone(stored ?: floatingZone)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* All-day series are date-anchored: pin the anchor to UTC midnight, as it is
|
* All-day series are date-anchored: pin the anchor to UTC midnight, as it is
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ import androidx.compose.foundation.layout.fillMaxSize
|
|||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.heightIn
|
import androidx.compose.foundation.layout.heightIn
|
||||||
import androidx.compose.foundation.layout.consumeWindowInsets
|
|
||||||
import androidx.compose.foundation.layout.imePadding
|
import androidx.compose.foundation.layout.imePadding
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
@@ -269,9 +268,6 @@ private fun DetailBody(
|
|||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.padding(inner)
|
.padding(inner)
|
||||||
// Consume the bar insets so imePadding adds only what the keyboard
|
|
||||||
// covers beyond them.
|
|
||||||
.consumeWindowInsets(inner)
|
|
||||||
// Shrink the scroll viewport by the keyboard so the focused add-subtask
|
// Shrink the scroll viewport by the keyboard so the focused add-subtask
|
||||||
// field scrolls into view above the IME instead of being hidden.
|
// field scrolls into view above the IME instead of being hidden.
|
||||||
.imePadding()
|
.imePadding()
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.ui.edit
|
|
||||||
|
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskReminder
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The editor's note that [listName]'s own defaults decided the reminders;
|
|
||||||
* [none] = they added none to this task.
|
|
||||||
*/
|
|
||||||
data class ListDefaultsHint(val listName: String, val none: Boolean)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The hint once the defaults have been applied, or null. [applied] = the defaults
|
|
||||||
* played a part (a gained or revived date, or an all-day switch that swapped them
|
|
||||||
* in); [wanted] are the reminders before that and [result] after. Only a list
|
|
||||||
* that overrides the general default ([ownDefaults]) gets one: naming it when its
|
|
||||||
* defaults added reminders, and saying it added none when the task is left with
|
|
||||||
* no reminder at all.
|
|
||||||
*/
|
|
||||||
internal fun listDefaultsHint(
|
|
||||||
listName: String?,
|
|
||||||
ownDefaults: Boolean,
|
|
||||||
applied: Boolean,
|
|
||||||
wanted: List<TaskReminder>,
|
|
||||||
result: List<TaskReminder>,
|
|
||||||
): ListDefaultsHint? {
|
|
||||||
if (listName == null || !ownDefaults || !applied) return null
|
|
||||||
return when {
|
|
||||||
(result - wanted.toSet()).isNotEmpty() -> ListDefaultsHint(listName, none = false)
|
|
||||||
result.isEmpty() -> ListDefaultsHint(listName, none = true)
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -57,7 +57,6 @@ import androidx.compose.foundation.layout.Row
|
|||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.consumeWindowInsets
|
|
||||||
import androidx.compose.foundation.layout.imePadding
|
import androidx.compose.foundation.layout.imePadding
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
@@ -220,9 +219,7 @@ fun TaskEditScreen(
|
|||||||
viewModel = viewModel,
|
viewModel = viewModel,
|
||||||
scroll = scroll,
|
scroll = scroll,
|
||||||
onTitleBottom = { titleBottom = it },
|
onTitleBottom = { titleBottom = it },
|
||||||
// Consumed so EditContent's imePadding adds only what the keyboard
|
modifier = Modifier.padding(inner),
|
||||||
// covers beyond the bars.
|
|
||||||
modifier = Modifier.padding(inner).consumeWindowInsets(inner),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -586,16 +583,6 @@ private fun EditContent(
|
|||||||
),
|
),
|
||||||
onClick = { showReminderPicker = true },
|
onClick = { showReminderPicker = true },
|
||||||
)
|
)
|
||||||
state.listDefaultsHint?.let { hint ->
|
|
||||||
Spacer(Modifier.height(4.dp))
|
|
||||||
FieldNote(
|
|
||||||
stringResource(
|
|
||||||
if (hint.none) R.string.edit_reminder_list_defaults_none else R.string.edit_reminder_list_defaults,
|
|
||||||
hint.listName,
|
|
||||||
),
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (TaskFormError.REMINDER_WITHOUT_DATE in state.errors) {
|
if (TaskFormError.REMINDER_WITHOUT_DATE in state.errors) {
|
||||||
Spacer(Modifier.height(4.dp))
|
Spacer(Modifier.height(4.dp))
|
||||||
FieldError(R.string.error_reminder_without_date)
|
FieldError(R.string.error_reminder_without_date)
|
||||||
@@ -1293,14 +1280,10 @@ private fun FieldPickerDialog(
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun FieldError(messageRes: Int) = FieldNote(stringResource(messageRes), MaterialTheme.colorScheme.error)
|
private fun FieldError(messageRes: Int) {
|
||||||
|
|
||||||
/** A line of small text under a field: an error, or a quieter note. */
|
|
||||||
@Composable
|
|
||||||
private fun FieldNote(text: String, color: Color) {
|
|
||||||
Text(
|
Text(
|
||||||
text = text,
|
text = stringResource(messageRes),
|
||||||
color = color,
|
color = MaterialTheme.colorScheme.error,
|
||||||
style = MaterialTheme.typography.bodySmall,
|
style = MaterialTheme.typography.bodySmall,
|
||||||
modifier = Modifier.padding(start = 4.dp),
|
modifier = Modifier.padding(start = 4.dp),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
|
|||||||
import de.jeanlucmakiola.agendula.data.prefs.DEFAULT_ALL_DAY_REMINDER_MINUTE
|
import de.jeanlucmakiola.agendula.data.prefs.DEFAULT_ALL_DAY_REMINDER_MINUTE
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.Settings
|
import de.jeanlucmakiola.agendula.data.prefs.Settings
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.SettingsPrefs
|
import de.jeanlucmakiola.agendula.data.prefs.SettingsPrefs
|
||||||
|
import de.jeanlucmakiola.agendula.data.reminders.ReminderScheduler
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TaskConflictException
|
import de.jeanlucmakiola.agendula.data.tasks.TaskConflictException
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TasksRepository
|
import de.jeanlucmakiola.agendula.data.tasks.TasksRepository
|
||||||
import de.jeanlucmakiola.agendula.domain.Priority
|
import de.jeanlucmakiola.agendula.domain.Priority
|
||||||
@@ -66,8 +67,6 @@ data class TaskEditUiState(
|
|||||||
val remindersChosen: Boolean = false,
|
val remindersChosen: Boolean = false,
|
||||||
/** The time an all-day reminder without one of its own rings at. */
|
/** The time an all-day reminder without one of its own rings at. */
|
||||||
val allDayMinuteOfDay: Int = DEFAULT_ALL_DAY_REMINDER_MINUTE,
|
val allDayMinuteOfDay: Int = DEFAULT_ALL_DAY_REMINDER_MINUTE,
|
||||||
/** Set while the defaults being applied are the list's own rather than the general ones. */
|
|
||||||
val listDefaultsHint: ListDefaultsHint? = null,
|
|
||||||
val location: String = "",
|
val location: String = "",
|
||||||
val url: String = "",
|
val url: String = "",
|
||||||
val tags: List<String> = emptyList(),
|
val tags: List<String> = emptyList(),
|
||||||
@@ -110,6 +109,7 @@ data class TaskEditUiState(
|
|||||||
class TaskEditViewModel @Inject constructor(
|
class TaskEditViewModel @Inject constructor(
|
||||||
private val repository: TasksRepository,
|
private val repository: TasksRepository,
|
||||||
private val settingsPrefs: SettingsPrefs,
|
private val settingsPrefs: SettingsPrefs,
|
||||||
|
private val reminderScheduler: ReminderScheduler,
|
||||||
) : ViewModel() {
|
) : ViewModel() {
|
||||||
|
|
||||||
private val _state = MutableStateFlow(TaskEditUiState())
|
private val _state = MutableStateFlow(TaskEditUiState())
|
||||||
@@ -149,13 +149,6 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
private var loadedReminders: List<TaskReminder> = emptyList()
|
private var loadedReminders: List<TaskReminder> = emptyList()
|
||||||
private var loadedStart: Instant? = null
|
private var loadedStart: Instant? = null
|
||||||
private var loadedDue: Instant? = null
|
private var loadedDue: Instant? = null
|
||||||
private var loadedAllDay = false
|
|
||||||
|
|
||||||
/** Whether [loadedReminders] are all-day ones; a task without dates converts them once it gets one. */
|
|
||||||
private var loadedKindAllDay = false
|
|
||||||
|
|
||||||
/** The reminders the user picked before clearing the task's last date, until a date comes back. */
|
|
||||||
private val setAside = mutableListOf<SetAside>()
|
|
||||||
|
|
||||||
/** Start a fresh task, optionally pre-selecting a list / parent. */
|
/** Start a fresh task, optionally pre-selecting a list / parent. */
|
||||||
fun bindNew(
|
fun bindNew(
|
||||||
@@ -164,12 +157,10 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
initialTitle: String? = null,
|
initialTitle: String? = null,
|
||||||
presetTag: String? = null,
|
presetTag: String? = null,
|
||||||
presetFilterId: Long? = null,
|
presetFilterId: Long? = null,
|
||||||
presetDueToday: Boolean = false,
|
|
||||||
) {
|
) {
|
||||||
if (bound) return
|
if (bound) return
|
||||||
bound = true
|
bound = true
|
||||||
editingTaskId = null
|
editingTaskId = null
|
||||||
setAside.clear()
|
|
||||||
baselineLastModified = null
|
baselineLastModified = null
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
val settings = settingsPrefs.settings.first()
|
val settings = settingsPrefs.settings.first()
|
||||||
@@ -178,7 +169,6 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
val lists = runCatching { repository.taskLists().first() }.getOrElse { emptyList() }
|
val lists = runCatching { repository.taskLists().first() }.getOrElse { emptyList() }
|
||||||
val preset = presetFilterId?.let { settingsPrefs.savedFilter(it).first() }
|
val preset = presetFilterId?.let { settingsPrefs.savedFilter(it).first() }
|
||||||
?.newTaskPreset(LocalDate.now())
|
?.newTaskPreset(LocalDate.now())
|
||||||
val presetDue = preset?.dueDate ?: LocalDate.now().takeIf { presetDueToday }
|
|
||||||
// A read-only or vanished default — or a widget's preset list, if it was
|
// A read-only or vanished default — or a widget's preset list, if it was
|
||||||
// since deleted or turned read-only — would give the task a list it
|
// since deleted or turned read-only — would give the task a list it
|
||||||
// cannot be saved to.
|
// cannot be saved to.
|
||||||
@@ -200,12 +190,12 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
// today's start would land after a due of today.
|
// today's start would land after a due of today.
|
||||||
start = when {
|
start = when {
|
||||||
!settings.defaultStartToday -> null
|
!settings.defaultStartToday -> null
|
||||||
presetDue != null -> allDayInstantOf(LocalDate.now())
|
preset?.dueDate != null -> allDayInstantOf(LocalDate.now())
|
||||||
else -> Clock.System.now()
|
else -> Clock.System.now()
|
||||||
},
|
},
|
||||||
// The same all-day value picking the date in the date field gives.
|
// The same all-day value picking the date in the date field gives.
|
||||||
due = presetDue?.let(::allDayInstantOf),
|
due = preset?.dueDate?.let(::allDayInstantOf),
|
||||||
isAllDay = presetDue != null,
|
isAllDay = preset?.dueDate != null,
|
||||||
priority = preset?.priority ?: Priority.NONE,
|
priority = preset?.priority ?: Priority.NONE,
|
||||||
parentId = parentId,
|
parentId = parentId,
|
||||||
lists = lists,
|
lists = lists,
|
||||||
@@ -223,7 +213,6 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
bound = true
|
bound = true
|
||||||
editingTaskId = taskId
|
editingTaskId = taskId
|
||||||
editingOccurrence = occurrenceStart
|
editingOccurrence = occurrenceStart
|
||||||
setAside.clear()
|
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
val settings = settingsPrefs.settings.first()
|
val settings = settingsPrefs.settings.first()
|
||||||
this@TaskEditViewModel.settings = settings
|
this@TaskEditViewModel.settings = settings
|
||||||
@@ -239,8 +228,6 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
storedReminders = loadedReminders.toSet()
|
storedReminders = loadedReminders.toSet()
|
||||||
loadedStart = task.start
|
loadedStart = task.start
|
||||||
loadedDue = task.due
|
loadedDue = task.due
|
||||||
loadedAllDay = task.isAllDay
|
|
||||||
loadedKindAllDay = task.isAllDay
|
|
||||||
_state.value = withFields(
|
_state.value = withFields(
|
||||||
TaskEditUiState(
|
TaskEditUiState(
|
||||||
loading = false,
|
loading = false,
|
||||||
@@ -266,12 +253,7 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
isOccurrence = task.isOccurrence,
|
isOccurrence = task.isOccurrence,
|
||||||
lists = lists,
|
lists = lists,
|
||||||
parentCandidates = loadParents(task.listId, selfId = taskId),
|
parentCandidates = loadParents(task.listId, selfId = taskId),
|
||||||
).let {
|
),
|
||||||
// Reminders stored on a task without dates can't ring; they don't come back with a date either.
|
|
||||||
if (it.hasDates) return@let it
|
|
||||||
loadedReminders = emptyList()
|
|
||||||
it.withoutReminders()
|
|
||||||
},
|
|
||||||
).also { baseline = it.toForm() }
|
).also { baseline = it.toForm() }
|
||||||
editingOccurrence = task.occurrenceStart
|
editingOccurrence = task.occurrenceStart
|
||||||
}
|
}
|
||||||
@@ -312,8 +294,7 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
* field that already carries a value (so editing never hides real data).
|
* field that already carries a value (so editing never hides real data).
|
||||||
*/
|
*/
|
||||||
private fun withFields(state: TaskEditUiState): TaskEditUiState {
|
private fun withFields(state: TaskEditUiState): TaskEditUiState {
|
||||||
val visible = defaultFields + state.toForm().populatedFields() +
|
val visible = defaultFields + state.toForm().populatedFields()
|
||||||
setOfNotNull(TaskFormField.Reminder.takeIf { state.listDefaultsHint != null })
|
|
||||||
return state.copy(visibleFields = visible, hiddenFields = hiddenOf(visible))
|
return state.copy(visibleFields = visible, hiddenFields = hiddenOf(visible))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -326,22 +307,15 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
/** Switching list invalidates the parent (it lived in the old list); reload candidates. */
|
/** Switching list invalidates the parent (it lived in the old list); reload candidates. */
|
||||||
fun onListChange(listId: Long) {
|
fun onListChange(listId: Long) {
|
||||||
if (_state.value.listId == listId) return // re-picking the same list keeps the parent
|
if (_state.value.listId == listId) return // re-picking the same list keeps the parent
|
||||||
update { it.copy(listId = listId, parentId = null, errors = emptySet()).withDatedReminders() }
|
update { it.copy(listId = listId, parentId = null, errors = emptySet()).withDefaultReminders() }
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
val candidates = loadParents(listId, selfId = editingTaskId)
|
val candidates = loadParents(listId, selfId = editingTaskId)
|
||||||
update { it.copy(parentCandidates = candidates) }
|
update { it.copy(parentCandidates = candidates) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun onStartChange(value: Instant?) = update {
|
fun onStartChange(value: Instant?) = update { it.copy(start = value).withDefaultReminders() }
|
||||||
val next = it.copy(start = value)
|
fun onDueChange(value: Instant?) = update { it.copy(due = value).withDefaultReminders() }
|
||||||
next.withDatedReminders(lostDates = it.hasDates && !next.hasDates)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun onDueChange(value: Instant?) = update {
|
|
||||||
val next = it.copy(due = value)
|
|
||||||
next.withDatedReminders(lostDates = it.hasDates && !next.hasDates)
|
|
||||||
}
|
|
||||||
/**
|
/**
|
||||||
* All-day and timed values use different conventions (UTC midnight vs. a real
|
* All-day and timed values use different conventions (UTC midnight vs. a real
|
||||||
* instant in the device zone), so the switch has to move the timestamps too —
|
* instant in the device zone), so the switch has to move the timestamps too —
|
||||||
@@ -358,16 +332,8 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
due = it.due?.rebasedForAllDay(value),
|
due = it.due?.rebasedForAllDay(value),
|
||||||
)
|
)
|
||||||
if (!it.remindersTouched) {
|
if (!it.remindersTouched) {
|
||||||
val before = loadedReminders
|
loadedReminders = carried(loadedReminders, switched)
|
||||||
val next = switched.withDatedReminders()
|
return@update switched.withDefaultReminders()
|
||||||
// The loaded reminders only change kind on a dated task; the list's defaults swapped in show the hint.
|
|
||||||
val swapped = before.isNotEmpty() && loadedReminders !== before &&
|
|
||||||
StoredReminders.keptAcrossSwitch(before, switched.toForm(), settings) == null
|
|
||||||
return@update if (swapped && next.listDefaultsHint == null) {
|
|
||||||
next.withListHint(applied = true, wanted = emptyList())
|
|
||||||
} else {
|
|
||||||
next
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
switched.copy(reminders = carried(it.reminders, switched).sortedForDisplay(switched))
|
switched.copy(reminders = carried(it.reminders, switched).sortedForDisplay(switched))
|
||||||
}
|
}
|
||||||
@@ -378,40 +344,12 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
val carried = if (previous != null && previous.second == reminders) {
|
val carried = if (previous != null && previous.second == reminders) {
|
||||||
previous.first
|
previous.first
|
||||||
} else {
|
} else {
|
||||||
switchedFor(reminders, switched)
|
StoredReminders.switched(reminders, switched.toForm(), settings, nowMillis(), ZoneId.systemDefault())
|
||||||
}
|
}
|
||||||
lastSwitch = reminders to carried
|
lastSwitch = reminders to carried
|
||||||
return carried
|
return carried
|
||||||
}
|
}
|
||||||
|
|
||||||
/** [reminders] made [state]'s kind, timed or all-day. */
|
|
||||||
private fun switchedFor(reminders: List<TaskReminder>, state: TaskEditUiState): List<TaskReminder> =
|
|
||||||
StoredReminders.switched(reminders, state.toForm(), settings, nowMillis(), ZoneId.systemDefault())
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [withDefaultReminders] for a task that may have lost its dates: with none
|
|
||||||
* left its reminders have nothing to count from and go (#159). Those the user
|
|
||||||
* picked are set aside when the last date goes and come back with the next
|
|
||||||
* one; untouched ones come back from [loadedReminders] anyway. Reminders
|
|
||||||
* picked while the task has no date stay, for the form to point out.
|
|
||||||
*/
|
|
||||||
private fun TaskEditUiState.withDatedReminders(lostDates: Boolean = false): TaskEditUiState {
|
|
||||||
if (!hasDates) {
|
|
||||||
if (!remindersTouched) return if (reminders.isEmpty()) this else withoutReminders()
|
|
||||||
if (!lostDates || reminders.isEmpty()) return this
|
|
||||||
setAside += SetAside(reminders, isAllDay)
|
|
||||||
return withoutReminders()
|
|
||||||
}
|
|
||||||
if (loadedKindAllDay != isAllDay) {
|
|
||||||
loadedReminders = carried(loadedReminders, this)
|
|
||||||
loadedKindAllDay = isAllDay
|
|
||||||
}
|
|
||||||
if (setAside.isEmpty()) return withDefaultReminders()
|
|
||||||
val restored = setAside.flatMap { if (it.allDay == isAllDay) it.reminders else switchedFor(it.reminders, this) }
|
|
||||||
setAside.clear()
|
|
||||||
return copy(reminders = (reminders + restored).distinct().sortedForDisplay(this), remindersChosen = true)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The reminders the task will be saved with while the user has not
|
* The reminders the task will be saved with while the user has not
|
||||||
* touched them: those it was loaded with, plus the defaults of the dates
|
* touched them: those it was loaded with, plus the defaults of the dates
|
||||||
@@ -424,45 +362,18 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
toForm().copy(reminders = loadedReminders),
|
toForm().copy(reminders = loadedReminders),
|
||||||
loadedStart,
|
loadedStart,
|
||||||
loadedDue,
|
loadedDue,
|
||||||
loadedAllDay,
|
|
||||||
settings,
|
settings,
|
||||||
nowMillis(),
|
nowMillis(),
|
||||||
ZoneId.systemDefault(),
|
ZoneId.systemDefault(),
|
||||||
).sortedForDisplay(this)
|
).sortedForDisplay(this)
|
||||||
val visible = if (reminders.isEmpty()) visibleFields else visibleFields + TaskFormField.Reminder
|
val visible = if (reminders.isEmpty()) visibleFields else visibleFields + TaskFormField.Reminder
|
||||||
val applied = StoredReminders.freshAnchors(
|
|
||||||
toForm().copy(reminders = loadedReminders),
|
|
||||||
loadedStart,
|
|
||||||
loadedDue,
|
|
||||||
loadedAllDay,
|
|
||||||
settings,
|
|
||||||
nowMillis(),
|
|
||||||
ZoneId.systemDefault(),
|
|
||||||
).isNotEmpty()
|
|
||||||
return copy(
|
return copy(
|
||||||
reminders = reminders,
|
reminders = reminders,
|
||||||
// A new task's, or defaults added to the ones it had: stored as shown.
|
// A new task's, or defaults added to the ones it had: stored as shown.
|
||||||
remindersChosen = isNew || reminders.toSet() != storedReminders,
|
remindersChosen = isNew || reminders.toSet() != storedReminders,
|
||||||
visibleFields = visible,
|
visibleFields = visible,
|
||||||
hiddenFields = hiddenOf(visible),
|
hiddenFields = hiddenOf(visible),
|
||||||
).withListHint(applied, loadedReminders)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets [TaskEditUiState.listDefaultsHint] for defaults just applied over [wanted]
|
|
||||||
* (see [listDefaultsHint]), unfolding the reminders so the hint shows.
|
|
||||||
*/
|
|
||||||
private fun TaskEditUiState.withListHint(applied: Boolean, wanted: List<TaskReminder>): TaskEditUiState {
|
|
||||||
val hint = listDefaultsHint(
|
|
||||||
listName = lists.firstOrNull { it.id == listId }?.name,
|
|
||||||
ownDefaults = listId?.let { settings.hasOwnReminders(it, isAllDay) } == true,
|
|
||||||
applied = applied,
|
|
||||||
wanted = wanted,
|
|
||||||
result = reminders,
|
|
||||||
)
|
)
|
||||||
if (hint == null) return copy(listDefaultsHint = null)
|
|
||||||
val visible = visibleFields + TaskFormField.Reminder
|
|
||||||
return copy(listDefaultsHint = hint, visibleFields = visible, hiddenFields = hiddenOf(visible))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun nowMillis(): Long = Clock.System.now().toEpochMilliseconds()
|
private fun nowMillis(): Long = Clock.System.now().toEpochMilliseconds()
|
||||||
@@ -474,12 +385,11 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
reminders = (it.reminders + reminder).distinct().sortedForDisplay(it),
|
reminders = (it.reminders + reminder).distinct().sortedForDisplay(it),
|
||||||
remindersTouched = true,
|
remindersTouched = true,
|
||||||
remindersChosen = true,
|
remindersChosen = true,
|
||||||
listDefaultsHint = null,
|
|
||||||
errors = emptySet(),
|
errors = emptySet(),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
fun removeReminder(reminder: TaskReminder) = update {
|
fun removeReminder(reminder: TaskReminder) = update {
|
||||||
it.copy(reminders = it.reminders - reminder, remindersTouched = true, remindersChosen = true, listDefaultsHint = null)
|
it.copy(reminders = it.reminders - reminder, remindersTouched = true, remindersChosen = true)
|
||||||
}
|
}
|
||||||
fun onLocationChange(value: String) = update { it.copy(location = value) }
|
fun onLocationChange(value: String) = update { it.copy(location = value) }
|
||||||
fun onUrlChange(value: String) = update { it.copy(url = value) }
|
fun onUrlChange(value: String) = update { it.copy(url = value) }
|
||||||
@@ -536,6 +446,13 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
scope = scope,
|
scope = scope,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
// ⚠️ Outside the write's own result. The task is saved by this
|
||||||
|
// point, and reporting a scheduling failure as a *save* failure
|
||||||
|
// sends the user back to tap Save again — on a screen whose
|
||||||
|
// editingTaskId is still null, which creates a second task. The
|
||||||
|
// reminder is re-synced on the next data change and on launch;
|
||||||
|
// the duplicate is forever.
|
||||||
|
runCatching { reminderScheduler.sync() }
|
||||||
}.onSuccess {
|
}.onSuccess {
|
||||||
_state.value = _state.value.copy(saved = true, saveFailed = false, saveConflict = false)
|
_state.value = _state.value.copy(saved = true, saveFailed = false, saveConflict = false)
|
||||||
}.onFailure { error ->
|
}.onFailure { error ->
|
||||||
@@ -560,15 +477,6 @@ class TaskEditViewModel @Inject constructor(
|
|||||||
private fun List<TaskReminder>.sortedForDisplay(state: TaskEditUiState): List<TaskReminder> =
|
private fun List<TaskReminder>.sortedForDisplay(state: TaskEditUiState): List<TaskReminder> =
|
||||||
sortedWith(taskReminderDisplayOrder(state.isAllDay, state.allDayMinuteOfDay))
|
sortedWith(taskReminderDisplayOrder(state.isAllDay, state.allDayMinuteOfDay))
|
||||||
|
|
||||||
private val TaskEditUiState.hasDates: Boolean get() = start != null || due != null
|
|
||||||
|
|
||||||
/** No reminders shown; saved, the task keeps none of its own without turning reminders off. */
|
|
||||||
private fun TaskEditUiState.withoutReminders(): TaskEditUiState =
|
|
||||||
copy(reminders = emptyList(), remindersChosen = false, listDefaultsHint = null)
|
|
||||||
|
|
||||||
/** Reminders put away while the task has no date, as the kind they were picked in. */
|
|
||||||
private class SetAside(val reminders: List<TaskReminder>, val allDay: Boolean)
|
|
||||||
|
|
||||||
/** Snapshot the editable state as a validated [TaskForm]. */
|
/** Snapshot the editable state as a validated [TaskForm]. */
|
||||||
private fun TaskEditUiState.toForm(): TaskForm = TaskForm(
|
private fun TaskEditUiState.toForm(): TaskForm = TaskForm(
|
||||||
title = title,
|
title = title,
|
||||||
|
|||||||
@@ -29,12 +29,7 @@ import androidx.compose.foundation.layout.height
|
|||||||
import androidx.compose.foundation.layout.heightIn
|
import androidx.compose.foundation.layout.heightIn
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.layout.WindowInsets
|
import androidx.compose.foundation.layout.statusBarsPadding
|
||||||
import androidx.compose.foundation.layout.ime
|
|
||||||
import androidx.compose.foundation.layout.navigationBars
|
|
||||||
import androidx.compose.foundation.layout.union
|
|
||||||
import androidx.compose.foundation.layout.windowInsetsBottomHeight
|
|
||||||
import androidx.compose.foundation.layout.windowInsetsPadding
|
|
||||||
import androidx.compose.foundation.layout.width
|
import androidx.compose.foundation.layout.width
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
import androidx.compose.foundation.lazy.LazyListScope
|
import androidx.compose.foundation.lazy.LazyListScope
|
||||||
@@ -65,7 +60,6 @@ import androidx.compose.material3.MaterialTheme
|
|||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Surface
|
import androidx.compose.material3.Surface
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TopAppBarDefaults
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
@@ -519,7 +513,7 @@ private fun HomeTopBar(
|
|||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.windowInsetsPadding(TopAppBarDefaults.windowInsets)
|
.statusBarsPadding()
|
||||||
.height(72.dp)
|
.height(72.dp)
|
||||||
.padding(horizontal = 12.dp),
|
.padding(horizontal = 12.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
@@ -678,14 +672,10 @@ private fun SearchResults(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// The last result scrolls clear of the navigation bar and the keyboard.
|
|
||||||
LazyColumn(modifier = Modifier.fillMaxSize()) {
|
LazyColumn(modifier = Modifier.fillMaxSize()) {
|
||||||
items(results, key = { it.occurrenceKey }) { task ->
|
items(results, key = { it.occurrenceKey }) { task ->
|
||||||
UpcomingRow(task = task, onClick = { onOpenTask(task) })
|
UpcomingRow(task = task, onClick = { onOpenTask(task) })
|
||||||
}
|
}
|
||||||
item(key = "bottom-inset") {
|
|
||||||
Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.navigationBars.union(WindowInsets.ime)))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -172,12 +172,14 @@ class ListsViewModel @Inject constructor(
|
|||||||
SmartCount(SmartList.ALL, smartTopLevel.size),
|
SmartCount(SmartList.ALL, smartTopLevel.size),
|
||||||
)
|
)
|
||||||
|
|
||||||
// Today ring: the completed rows of the Today list against all of its rows.
|
// Today ring: completed vs. total tasks *due today*. The numerator is the
|
||||||
|
// top-level completed tasks whose due date falls in today's window; the
|
||||||
|
// denominator adds the still-open ones (the Today smart count above).
|
||||||
val openToday = count(SmartList.TODAY)
|
val openToday = count(SmartList.TODAY)
|
||||||
val completedToday = completedTasks.count {
|
val completedDueToday = completedTasks.count {
|
||||||
!it.isSubtask && it.listId !in hidden && TaskFiltering.isToday(it, todayStart, todayEnd)
|
!it.isSubtask && it.listId !in hidden && it.due != null && it.due >= todayStart && it.due < todayEnd
|
||||||
}
|
}
|
||||||
val todayTotal = openToday + completedToday
|
val todayTotal = openToday + completedDueToday
|
||||||
|
|
||||||
// Upcoming preview: the next handful of open tasks due tomorrow onward,
|
// Upcoming preview: the next handful of open tasks due tomorrow onward,
|
||||||
// already sorted by the repository's default ordering.
|
// already sorted by the repository's default ordering.
|
||||||
@@ -212,7 +214,7 @@ class ListsViewModel @Inject constructor(
|
|||||||
smartCounts = smartCounts,
|
smartCounts = smartCounts,
|
||||||
filters = filters,
|
filters = filters,
|
||||||
groups = groups,
|
groups = groups,
|
||||||
todayDone = completedToday,
|
todayDone = completedDueToday,
|
||||||
todayTotal = todayTotal,
|
todayTotal = todayTotal,
|
||||||
upcoming = upcoming,
|
upcoming = upcoming,
|
||||||
allTasks = allTasks,
|
allTasks = allTasks,
|
||||||
|
|||||||
@@ -6,22 +6,16 @@ import androidx.compose.foundation.layout.Arrangement
|
|||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.WindowInsetsSides
|
|
||||||
import androidx.compose.foundation.layout.consumeWindowInsets
|
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
import androidx.compose.foundation.layout.fillMaxHeight
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.layout.only
|
|
||||||
import androidx.compose.foundation.layout.widthIn
|
import androidx.compose.foundation.layout.widthIn
|
||||||
import androidx.compose.foundation.layout.windowInsetsPadding
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.rounded.TaskAlt
|
import androidx.compose.material.icons.rounded.TaskAlt
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.ScaffoldDefaults
|
|
||||||
import androidx.compose.material3.Surface
|
import androidx.compose.material3.Surface
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
@@ -50,20 +44,14 @@ private val MAX_CONTENT_WIDTH = 720.dp
|
|||||||
/**
|
/**
|
||||||
* A phone-shaped column centred on a tablet or a landscape screen: a task list
|
* A phone-shaped column centred on a tablet or a landscape screen: a task list
|
||||||
* or a form stretched edge to edge across 1200dp reads as a spreadsheet.
|
* or a form stretched edge to edge across 1200dp reads as a spreadsheet.
|
||||||
*
|
|
||||||
* Also clears (and consumes) the side system bars and cutout, e.g. a 3-button
|
|
||||||
* navigation bar in landscape, so the screens inside only handle top and bottom.
|
|
||||||
*/
|
*/
|
||||||
@Composable
|
@Composable
|
||||||
internal fun ReadableWidth(modifier: Modifier = Modifier, content: @Composable () -> Unit) {
|
internal fun ReadableWidth(modifier: Modifier = Modifier, content: @Composable () -> Unit) {
|
||||||
Box(
|
Box(
|
||||||
modifier = modifier
|
modifier = modifier.fillMaxSize().background(MaterialTheme.colorScheme.surface),
|
||||||
.fillMaxSize()
|
|
||||||
.background(MaterialTheme.colorScheme.surface)
|
|
||||||
.windowInsetsPadding(ScaffoldDefaults.contentWindowInsets.only(WindowInsetsSides.Horizontal)),
|
|
||||||
contentAlignment = Alignment.TopCenter,
|
contentAlignment = Alignment.TopCenter,
|
||||||
) {
|
) {
|
||||||
Box(modifier = Modifier.fillMaxHeight().widthIn(max = MAX_CONTENT_WIDTH).fillMaxWidth()) { content() }
|
Box(modifier = Modifier.fillMaxSize().widthIn(max = MAX_CONTENT_WIDTH)) { content() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,28 +74,16 @@ internal fun TaskListDetailPanes(
|
|||||||
val clear = { selectedId = Dest.NO_ID }
|
val clear = { selectedId = Dest.NO_ID }
|
||||||
BackHandler(enabled = selectedId != Dest.NO_ID, onBack = clear)
|
BackHandler(enabled = selectedId != Dest.NO_ID, onBack = clear)
|
||||||
|
|
||||||
// Each pane clears only the side insets of the screen edge it touches, and
|
|
||||||
// consumes the other so its scaffold doesn't pad for it again.
|
|
||||||
val sideInsets = ScaffoldDefaults.contentWindowInsets
|
|
||||||
val start = sideInsets.only(WindowInsetsSides.Start)
|
|
||||||
val end = sideInsets.only(WindowInsetsSides.End)
|
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.fillMaxSize().background(MaterialTheme.colorScheme.surface),
|
modifier = Modifier.fillMaxSize().background(MaterialTheme.colorScheme.surface),
|
||||||
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||||
) {
|
) {
|
||||||
Box(
|
Box(Modifier.weight(1f).fillMaxHeight()) { list(select) }
|
||||||
Modifier
|
|
||||||
.weight(1f)
|
|
||||||
.fillMaxHeight()
|
|
||||||
.windowInsetsPadding(start)
|
|
||||||
.consumeWindowInsets(end),
|
|
||||||
) { list(select) }
|
|
||||||
Surface(
|
Surface(
|
||||||
color = MaterialTheme.colorScheme.surfaceContainerLow,
|
color = MaterialTheme.colorScheme.surfaceContainerLow,
|
||||||
shape = RoundedCornerShape(topStart = 28.dp, bottomStart = 28.dp),
|
shape = RoundedCornerShape(topStart = 28.dp, bottomStart = 28.dp),
|
||||||
modifier = Modifier.weight(1.2f).fillMaxHeight(),
|
modifier = Modifier.weight(1.2f).fillMaxHeight(),
|
||||||
) {
|
) {
|
||||||
Box(Modifier.fillMaxSize().windowInsetsPadding(end).consumeWindowInsets(start)) {
|
|
||||||
if (selectedId == Dest.NO_ID) {
|
if (selectedId == Dest.NO_ID) {
|
||||||
EmptyDetailPane()
|
EmptyDetailPane()
|
||||||
} else {
|
} else {
|
||||||
@@ -132,7 +108,6 @@ internal fun TaskListDetailPanes(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package de.jeanlucmakiola.agendula.ui.navigation
|
package de.jeanlucmakiola.agendula.ui.navigation
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import androidx.compose.animation.EnterTransition
|
import androidx.compose.animation.EnterTransition
|
||||||
import androidx.compose.animation.ExitTransition
|
import androidx.compose.animation.ExitTransition
|
||||||
import androidx.compose.animation.fadeIn
|
import androidx.compose.animation.fadeIn
|
||||||
@@ -18,7 +17,6 @@ import androidx.compose.material3.MaterialTheme
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.unit.IntOffset
|
import androidx.compose.ui.unit.IntOffset
|
||||||
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
|
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
|
||||||
import de.jeanlucmakiola.agendula.domain.SmartList
|
|
||||||
import de.jeanlucmakiola.agendula.domain.Task
|
import de.jeanlucmakiola.agendula.domain.Task
|
||||||
import kotlin.time.Instant
|
import kotlin.time.Instant
|
||||||
import androidx.navigation.compose.NavHost
|
import androidx.navigation.compose.NavHost
|
||||||
@@ -58,8 +56,6 @@ fun AgendulaNavHost(
|
|||||||
val nav = rememberNavController()
|
val nav = rememberNavController()
|
||||||
// The entry a widget, tile, shortcut or share opened; closing it leaves the app (#93).
|
// The entry a widget, tile, shortcut or share opened; closing it leaves the app (#93).
|
||||||
var returnHomeEntry by rememberSaveable { mutableStateOf<String?>(null) }
|
var returnHomeEntry by rememberSaveable { mutableStateOf<String?>(null) }
|
||||||
// No public API exposes the whole back stack, and visibleEntries drops an entry covered by another.
|
|
||||||
@SuppressLint("RestrictedApi")
|
|
||||||
val backStack by nav.currentBackStack.collectAsState()
|
val backStack by nav.currentBackStack.collectAsState()
|
||||||
LaunchedEffect(backStack, returnHomeEntry) {
|
LaunchedEffect(backStack, returnHomeEntry) {
|
||||||
val id = returnHomeEntry ?: return@LaunchedEffect
|
val id = returnHomeEntry ?: return@LaunchedEffect
|
||||||
@@ -79,9 +75,7 @@ fun AgendulaNavHost(
|
|||||||
is NavRequest.OpenAccount ->
|
is NavRequest.OpenAccount ->
|
||||||
nav.navigate(Dest.Settings.buildAccount(navRequest.accountId)) { launchSingleTop = true }
|
nav.navigate(Dest.Settings.buildAccount(navRequest.accountId)) { launchSingleTop = true }
|
||||||
is NavRequest.NewTask ->
|
is NavRequest.NewTask ->
|
||||||
nav.navigate(
|
nav.navigate(Dest.TaskEdit.buildNew(presetListId = navRequest.listId, title = navRequest.title))
|
||||||
Dest.TaskEdit.buildNew(presetListId = navRequest.listId, title = navRequest.title, dueToday = navRequest.dueToday),
|
|
||||||
)
|
|
||||||
is NavRequest.OpenSmart -> nav.navigate(Dest.TaskList.build(TaskFilter.Smart(navRequest.list))) {
|
is NavRequest.OpenSmart -> nav.navigate(Dest.TaskList.build(TaskFilter.Smart(navRequest.list))) {
|
||||||
launchSingleTop = true
|
launchSingleTop = true
|
||||||
}
|
}
|
||||||
@@ -166,7 +160,6 @@ fun AgendulaNavHost(
|
|||||||
presetListId = (filter as? TaskFilter.OfList)?.listId,
|
presetListId = (filter as? TaskFilter.OfList)?.listId,
|
||||||
tag = (filter as? TaskFilter.Tagged)?.tag,
|
tag = (filter as? TaskFilter.Tagged)?.tag,
|
||||||
filterId = (filter as? TaskFilter.Saved)?.id,
|
filterId = (filter as? TaskFilter.Saved)?.id,
|
||||||
dueToday = filter == TaskFilter.Smart(SmartList.TODAY),
|
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
@@ -238,7 +231,6 @@ fun AgendulaNavHost(
|
|||||||
val title = args?.getString(Dest.TaskEdit.ARG_TITLE)
|
val title = args?.getString(Dest.TaskEdit.ARG_TITLE)
|
||||||
val tag = args?.getString(Dest.TaskEdit.ARG_TAG)
|
val tag = args?.getString(Dest.TaskEdit.ARG_TAG)
|
||||||
val filterId = args?.getLong(Dest.TaskEdit.ARG_FILTER_ID)?.takeIf { it != Dest.NO_ID }
|
val filterId = args?.getLong(Dest.TaskEdit.ARG_FILTER_ID)?.takeIf { it != Dest.NO_ID }
|
||||||
val dueToday = args?.getBoolean(Dest.TaskEdit.ARG_DUE_TODAY) ?: false
|
|
||||||
val vm: TaskEditViewModel = hiltViewModel()
|
val vm: TaskEditViewModel = hiltViewModel()
|
||||||
LaunchedEffect(taskId, presetListId, parentId) {
|
LaunchedEffect(taskId, presetListId, parentId) {
|
||||||
if (taskId != Dest.NO_ID) {
|
if (taskId != Dest.NO_ID) {
|
||||||
@@ -250,7 +242,6 @@ fun AgendulaNavHost(
|
|||||||
initialTitle = title,
|
initialTitle = title,
|
||||||
presetTag = tag,
|
presetTag = tag,
|
||||||
presetFilterId = filterId,
|
presetFilterId = filterId,
|
||||||
presetDueToday = dueToday,
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ object Dest {
|
|||||||
/**
|
/**
|
||||||
* The create / edit form. `taskId` set ([NO_ID] otherwise) ⇒ edit; for a new
|
* The create / edit form. `taskId` set ([NO_ID] otherwise) ⇒ edit; for a new
|
||||||
* task, `presetListId` / `parentId` optionally seed the form, and `filterId`
|
* task, `presetListId` / `parentId` optionally seed the form, and `filterId`
|
||||||
* (or `dueToday`, for the Today list) fills it so the task lands in that view.
|
* fills it so the task lands in that saved filter.
|
||||||
*/
|
*/
|
||||||
object TaskEdit {
|
object TaskEdit {
|
||||||
const val ARG_TASK_ID = "taskId"
|
const val ARG_TASK_ID = "taskId"
|
||||||
@@ -129,7 +129,6 @@ object Dest {
|
|||||||
const val ARG_TITLE = "title"
|
const val ARG_TITLE = "title"
|
||||||
const val ARG_TAG = "tag"
|
const val ARG_TAG = "tag"
|
||||||
const val ARG_FILTER_ID = "filterId"
|
const val ARG_FILTER_ID = "filterId"
|
||||||
const val ARG_DUE_TODAY = "dueToday"
|
|
||||||
const val route =
|
const val route =
|
||||||
"taskEdit?$ARG_TASK_ID={$ARG_TASK_ID}" +
|
"taskEdit?$ARG_TASK_ID={$ARG_TASK_ID}" +
|
||||||
"&$ARG_PRESET_LIST_ID={$ARG_PRESET_LIST_ID}" +
|
"&$ARG_PRESET_LIST_ID={$ARG_PRESET_LIST_ID}" +
|
||||||
@@ -137,8 +136,7 @@ object Dest {
|
|||||||
"&$ARG_OCCURRENCE={$ARG_OCCURRENCE}" +
|
"&$ARG_OCCURRENCE={$ARG_OCCURRENCE}" +
|
||||||
"&$ARG_TITLE={$ARG_TITLE}" +
|
"&$ARG_TITLE={$ARG_TITLE}" +
|
||||||
"&$ARG_TAG={$ARG_TAG}" +
|
"&$ARG_TAG={$ARG_TAG}" +
|
||||||
"&$ARG_FILTER_ID={$ARG_FILTER_ID}" +
|
"&$ARG_FILTER_ID={$ARG_FILTER_ID}"
|
||||||
"&$ARG_DUE_TODAY={$ARG_DUE_TODAY}"
|
|
||||||
|
|
||||||
val arguments = listOf(
|
val arguments = listOf(
|
||||||
navArgument(ARG_TASK_ID) { type = NavType.LongType; defaultValue = NO_ID },
|
navArgument(ARG_TASK_ID) { type = NavType.LongType; defaultValue = NO_ID },
|
||||||
@@ -148,7 +146,6 @@ object Dest {
|
|||||||
navArgument(ARG_TITLE) { type = NavType.StringType; nullable = true; defaultValue = null },
|
navArgument(ARG_TITLE) { type = NavType.StringType; nullable = true; defaultValue = null },
|
||||||
navArgument(ARG_TAG) { type = NavType.StringType; nullable = true; defaultValue = null },
|
navArgument(ARG_TAG) { type = NavType.StringType; nullable = true; defaultValue = null },
|
||||||
navArgument(ARG_FILTER_ID) { type = NavType.LongType; defaultValue = NO_ID },
|
navArgument(ARG_FILTER_ID) { type = NavType.LongType; defaultValue = NO_ID },
|
||||||
navArgument(ARG_DUE_TODAY) { type = NavType.BoolType; defaultValue = false },
|
|
||||||
)
|
)
|
||||||
|
|
||||||
fun buildEdit(taskId: Long, occurrenceStart: Long? = null): String =
|
fun buildEdit(taskId: Long, occurrenceStart: Long? = null): String =
|
||||||
@@ -161,7 +158,6 @@ object Dest {
|
|||||||
title: String? = null,
|
title: String? = null,
|
||||||
tag: String? = null,
|
tag: String? = null,
|
||||||
filterId: Long? = null,
|
filterId: Long? = null,
|
||||||
dueToday: Boolean = false,
|
|
||||||
): String {
|
): String {
|
||||||
val params = buildList {
|
val params = buildList {
|
||||||
if (presetListId != null) add("$ARG_PRESET_LIST_ID=$presetListId")
|
if (presetListId != null) add("$ARG_PRESET_LIST_ID=$presetListId")
|
||||||
@@ -169,7 +165,6 @@ object Dest {
|
|||||||
if (!title.isNullOrBlank()) add("$ARG_TITLE=${android.net.Uri.encode(title)}")
|
if (!title.isNullOrBlank()) add("$ARG_TITLE=${android.net.Uri.encode(title)}")
|
||||||
if (!tag.isNullOrBlank()) add("$ARG_TAG=${android.net.Uri.encode(tag)}")
|
if (!tag.isNullOrBlank()) add("$ARG_TAG=${android.net.Uri.encode(tag)}")
|
||||||
if (filterId != null) add("$ARG_FILTER_ID=$filterId")
|
if (filterId != null) add("$ARG_FILTER_ID=$filterId")
|
||||||
if (dueToday) add("$ARG_DUE_TODAY=true")
|
|
||||||
}
|
}
|
||||||
return if (params.isEmpty()) "taskEdit" else "taskEdit?${params.joinToString("&")}"
|
return if (params.isEmpty()) "taskEdit" else "taskEdit?${params.joinToString("&")}"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,14 +27,12 @@ sealed interface NavRequest {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* A new task, optionally titled with text shared from another app, or
|
* A new task, optionally titled with text shared from another app, or
|
||||||
* preset to a list — a widget's own add button, when it shows one list —
|
* preset to a list — a widget's own add button, when it shows one list.
|
||||||
* or due today, from a Today widget.
|
|
||||||
* [returnHome] leaves the app once the form is closed (#93).
|
* [returnHome] leaves the app once the form is closed (#93).
|
||||||
*/
|
*/
|
||||||
data class NewTask(
|
data class NewTask(
|
||||||
val title: String? = null,
|
val title: String? = null,
|
||||||
val listId: Long? = null,
|
val listId: Long? = null,
|
||||||
val dueToday: Boolean = false,
|
|
||||||
val returnHome: Boolean = false,
|
val returnHome: Boolean = false,
|
||||||
) : NavRequest
|
) : NavRequest
|
||||||
|
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ import androidx.compose.runtime.remember
|
|||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.res.colorResource
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
@@ -25,10 +23,8 @@ import de.jeanlucmakiola.agendula.data.prefs.is24Hour
|
|||||||
import de.jeanlucmakiola.agendula.ui.common.formatMinuteOfDay
|
import de.jeanlucmakiola.agendula.ui.common.formatMinuteOfDay
|
||||||
import de.jeanlucmakiola.agendula.ui.common.localeFirstDayOfWeek
|
import de.jeanlucmakiola.agendula.ui.common.localeFirstDayOfWeek
|
||||||
import de.jeanlucmakiola.floret.components.CollapsingScaffold
|
import de.jeanlucmakiola.floret.components.CollapsingScaffold
|
||||||
import de.jeanlucmakiola.floret.components.FullScreenPicker
|
import de.jeanlucmakiola.floret.components.GroupedHint
|
||||||
import de.jeanlucmakiola.floret.components.GroupedRow
|
import de.jeanlucmakiola.floret.components.GroupedRow
|
||||||
import de.jeanlucmakiola.floret.components.LauncherMark
|
|
||||||
import de.jeanlucmakiola.floret.components.LauncherNameChooser
|
|
||||||
import de.jeanlucmakiola.floret.components.OptionPicker
|
import de.jeanlucmakiola.floret.components.OptionPicker
|
||||||
import de.jeanlucmakiola.floret.components.Position
|
import de.jeanlucmakiola.floret.components.Position
|
||||||
import de.jeanlucmakiola.floret.locale.currentLocale
|
import de.jeanlucmakiola.floret.locale.currentLocale
|
||||||
@@ -110,25 +106,15 @@ internal fun AppearanceScreen(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (showAppName) {
|
if (showAppName) {
|
||||||
FullScreenPicker(
|
OptionPicker(
|
||||||
title = stringResource(R.string.settings_app_name),
|
title = stringResource(R.string.settings_app_name),
|
||||||
onDismiss = { showAppName = false },
|
|
||||||
predictiveBack = true,
|
|
||||||
) {
|
|
||||||
LauncherNameChooser(
|
|
||||||
summary = stringResource(R.string.settings_app_name_hint),
|
|
||||||
options = LauncherName.entries,
|
options = LauncherName.entries,
|
||||||
selected = launcherName,
|
selected = launcherName,
|
||||||
label = { launcherNameLabel(it) },
|
label = { launcherNameLabel(it) },
|
||||||
|
header = { GroupedHint(stringResource(R.string.settings_app_name_hint)) },
|
||||||
onSelect = viewModel::setLauncherName,
|
onSelect = viewModel::setLauncherName,
|
||||||
mark = {
|
onDismiss = { showAppName = false },
|
||||||
LauncherMark(
|
|
||||||
background = colorResource(R.color.ic_launcher_background),
|
|
||||||
foreground = painterResource(R.drawable.ic_launcher_foreground),
|
|
||||||
)
|
)
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (showTimeFormat) {
|
if (showTimeFormat) {
|
||||||
|
|||||||
@@ -33,17 +33,12 @@ import androidx.compose.ui.Modifier
|
|||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.res.pluralStringResource
|
import androidx.compose.ui.res.pluralStringResource
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.AnnotatedString
|
|
||||||
import androidx.compose.ui.text.SpanStyle
|
|
||||||
import androidx.compose.ui.text.buildAnnotatedString
|
|
||||||
import androidx.compose.ui.text.withStyle
|
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.core.app.ActivityCompat
|
import androidx.core.app.ActivityCompat
|
||||||
import androidx.core.app.NotificationManagerCompat
|
import androidx.core.app.NotificationManagerCompat
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.core.net.toUri
|
import androidx.core.net.toUri
|
||||||
import de.jeanlucmakiola.agendula.R
|
import de.jeanlucmakiola.agendula.R
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.ReminderDescription
|
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.SNOOZE_PRESETS
|
import de.jeanlucmakiola.agendula.data.prefs.SNOOZE_PRESETS
|
||||||
import de.jeanlucmakiola.agendula.data.reminders.TaskNotifier
|
import de.jeanlucmakiola.agendula.data.reminders.TaskNotifier
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskReminderOrder
|
import de.jeanlucmakiola.agendula.domain.TaskReminderOrder
|
||||||
@@ -118,7 +113,6 @@ internal fun NotificationsScreen(
|
|||||||
var showOffset by remember { mutableStateOf(false) }
|
var showOffset by remember { mutableStateOf(false) }
|
||||||
var showAllDay by remember { mutableStateOf(false) }
|
var showAllDay by remember { mutableStateOf(false) }
|
||||||
var showSnooze by remember { mutableStateOf(false) }
|
var showSnooze by remember { mutableStateOf(false) }
|
||||||
var showDescription by remember { mutableStateOf(false) }
|
|
||||||
var showAllDayTime by remember { mutableStateOf(false) }
|
var showAllDayTime by remember { mutableStateOf(false) }
|
||||||
var perListExpanded by remember { mutableStateOf(false) }
|
var perListExpanded by remember { mutableStateOf(false) }
|
||||||
var expandedLists by remember { mutableStateOf(emptySet<Long>()) }
|
var expandedLists by remember { mutableStateOf(emptySet<Long>()) }
|
||||||
@@ -128,9 +122,6 @@ internal fun NotificationsScreen(
|
|||||||
formatMinuteOfDay(state.settings.allDayReminderMinuteOfDay, LocalUse24HourFormat.current),
|
formatMinuteOfDay(state.settings.allDayReminderMinuteOfDay, LocalUse24HourFormat.current),
|
||||||
)
|
)
|
||||||
val lists = state.lists.filter { it.id > 0L }
|
val lists = state.lists.filter { it.id > 0L }
|
||||||
val ownTimed = lists.count { state.settings.hasOwnReminders(it.id, allDay = false) }
|
|
||||||
val ownAllDay = lists.count { state.settings.hasOwnReminders(it.id, allDay = true) }
|
|
||||||
val ownAny = lists.count { state.settings.hasOwnReminders(it.id) }
|
|
||||||
|
|
||||||
CollapsingScaffold(
|
CollapsingScaffold(
|
||||||
title = stringResource(R.string.settings_section_reminders),
|
title = stringResource(R.string.settings_section_reminders),
|
||||||
@@ -171,13 +162,13 @@ internal fun NotificationsScreen(
|
|||||||
}
|
}
|
||||||
GroupedRow(
|
GroupedRow(
|
||||||
title = stringResource(R.string.settings_default_reminder),
|
title = stringResource(R.string.settings_default_reminder),
|
||||||
summary = withOwnCount(reminderChoiceLabel(state.settings.defaultReminders), ownTimed),
|
summary = reminderChoiceLabel(state.settings.defaultReminders),
|
||||||
position = Position.Middle,
|
position = Position.Middle,
|
||||||
onClick = { showOffset = true },
|
onClick = { showOffset = true },
|
||||||
)
|
)
|
||||||
GroupedRow(
|
GroupedRow(
|
||||||
title = stringResource(R.string.settings_default_reminder_allday),
|
title = stringResource(R.string.settings_default_reminder_allday),
|
||||||
summary = withOwnCount(reminderChoiceLabel(state.settings.defaultAllDayReminders, allDay = true), ownAllDay),
|
summary = reminderChoiceLabel(state.settings.defaultAllDayReminders, allDay = true),
|
||||||
position = Position.Middle,
|
position = Position.Middle,
|
||||||
onClick = { showAllDay = true },
|
onClick = { showAllDay = true },
|
||||||
)
|
)
|
||||||
@@ -187,14 +178,8 @@ internal fun NotificationsScreen(
|
|||||||
R.string.settings_allday_reminder_time_summary,
|
R.string.settings_allday_reminder_time_summary,
|
||||||
formatMinuteOfDay(state.settings.allDayReminderMinuteOfDay, LocalUse24HourFormat.current),
|
formatMinuteOfDay(state.settings.allDayReminderMinuteOfDay, LocalUse24HourFormat.current),
|
||||||
),
|
),
|
||||||
position = Position.Middle,
|
|
||||||
onClick = { showAllDayTime = true },
|
|
||||||
)
|
|
||||||
GroupedRow(
|
|
||||||
title = stringResource(R.string.settings_reminder_description),
|
|
||||||
summary = reminderDescriptionLabel(state.settings.reminderDescription),
|
|
||||||
position = Position.Bottom,
|
position = Position.Bottom,
|
||||||
onClick = { showDescription = true },
|
onClick = { showAllDayTime = true },
|
||||||
)
|
)
|
||||||
|
|
||||||
Spacer(Modifier.height(24.dp))
|
Spacer(Modifier.height(24.dp))
|
||||||
@@ -224,10 +209,7 @@ internal fun NotificationsScreen(
|
|||||||
// opens its bottom (Top) when expanded, and the last list rounds it off.
|
// opens its bottom (Top) when expanded, and the last list rounds it off.
|
||||||
GroupedRow(
|
GroupedRow(
|
||||||
title = stringResource(R.string.settings_list_reminders_title),
|
title = stringResource(R.string.settings_list_reminders_title),
|
||||||
summary = listOfNotNull(
|
summary = stringResource(R.string.settings_list_reminders_hint),
|
||||||
if (ownAny > 0) pluralStringResource(R.plurals.settings_list_reminders_own_count, ownAny, ownAny) else null,
|
|
||||||
stringResource(R.string.settings_list_reminders_hint),
|
|
||||||
).joinToString("\n"),
|
|
||||||
position = if (perListExpanded) Position.Top else Position.Alone,
|
position = if (perListExpanded) Position.Top else Position.Alone,
|
||||||
trailing = {
|
trailing = {
|
||||||
Icon(
|
Icon(
|
||||||
@@ -250,8 +232,7 @@ internal fun NotificationsScreen(
|
|||||||
// Every list is mid-run under the header; the last rounds
|
// Every list is mid-run under the header; the last rounds
|
||||||
// off, unless it is open and its two rows close the run.
|
// off, unless it is open and its two rows close the run.
|
||||||
GroupedRow(
|
GroupedRow(
|
||||||
title = AnnotatedString(list.name),
|
title = list.name,
|
||||||
summary = listSourceSummary(state.settings.hasOwnReminders(list.id)),
|
|
||||||
position = if (last && !expanded) Position.Bottom else Position.Middle,
|
position = if (last && !expanded) Position.Bottom else Position.Middle,
|
||||||
leading = {
|
leading = {
|
||||||
Icon(Icons.Rounded.Circle, contentDescription = null, tint = pastelize(list.color, dark))
|
Icon(Icons.Rounded.Circle, contentDescription = null, tint = pastelize(list.color, dark))
|
||||||
@@ -337,17 +318,6 @@ internal fun NotificationsScreen(
|
|||||||
onDismiss = { showSnooze = false },
|
onDismiss = { showSnooze = false },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if (showDescription) {
|
|
||||||
OptionPicker(
|
|
||||||
title = stringResource(R.string.settings_reminder_description),
|
|
||||||
options = ReminderDescription.entries,
|
|
||||||
selected = state.settings.reminderDescription,
|
|
||||||
label = { reminderDescriptionLabel(it) },
|
|
||||||
summary = { reminderDescriptionSummary(it) },
|
|
||||||
onSelect = viewModel::setReminderDescription,
|
|
||||||
onDismiss = { showDescription = false },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (showAllDayTime) {
|
if (showAllDayTime) {
|
||||||
val minute = state.settings.allDayReminderMinuteOfDay
|
val minute = state.settings.allDayReminderMinuteOfDay
|
||||||
TimePickerAlert(
|
TimePickerAlert(
|
||||||
@@ -384,46 +354,9 @@ private fun snoozeLabel(minutes: Int): String =
|
|||||||
if (minutes % 60 == 0) pluralStringResource(R.plurals.duration_hours, minutes / 60, minutes / 60)
|
if (minutes % 60 == 0) pluralStringResource(R.plurals.duration_hours, minutes / 60, minutes / 60)
|
||||||
else pluralStringResource(R.plurals.duration_minutes, minutes, minutes)
|
else pluralStringResource(R.plurals.duration_minutes, minutes, minutes)
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun reminderDescriptionLabel(pref: ReminderDescription): String = stringResource(
|
|
||||||
when (pref) {
|
|
||||||
ReminderDescription.HIDDEN -> R.string.settings_reminder_description_hidden
|
|
||||||
ReminderDescription.SHORT -> R.string.settings_reminder_description_short
|
|
||||||
ReminderDescription.FULL -> R.string.settings_reminder_description_full
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
private fun reminderDescriptionSummary(pref: ReminderDescription): String = stringResource(
|
|
||||||
when (pref) {
|
|
||||||
ReminderDescription.HIDDEN -> R.string.settings_reminder_description_hidden_summary
|
|
||||||
ReminderDescription.SHORT -> R.string.settings_reminder_description_short_summary
|
|
||||||
ReminderDescription.FULL -> R.string.settings_reminder_description_full_summary
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
/** Which list's override picker is open, and for which kind of task. */
|
/** Which list's override picker is open, and for which kind of task. */
|
||||||
private data class OverrideTarget(val listId: Long, val allDay: Boolean)
|
private data class OverrideTarget(val listId: Long, val allDay: Boolean)
|
||||||
|
|
||||||
/** The default row's summary, with a second line counting the lists that override it. */
|
|
||||||
@Composable
|
|
||||||
private fun withOwnCount(label: String, own: Int): String =
|
|
||||||
if (own == 0) label
|
|
||||||
else label + "\n" + pluralStringResource(R.plurals.settings_default_reminder_lists_own, own, own)
|
|
||||||
|
|
||||||
/** Whether a list follows the general default; an override stands out in the primary colour. */
|
|
||||||
@Composable
|
|
||||||
private fun listSourceSummary(own: Boolean): AnnotatedString =
|
|
||||||
if (own) {
|
|
||||||
buildAnnotatedString {
|
|
||||||
withStyle(SpanStyle(color = MaterialTheme.colorScheme.primary)) {
|
|
||||||
append(stringResource(R.string.settings_list_reminder_own))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
AnnotatedString(stringResource(R.string.settings_list_reminder_follows))
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Row summary for a list: its override, or the inherited global default. */
|
/** Row summary for a list: its override, or the inherited global default. */
|
||||||
@Composable
|
@Composable
|
||||||
private fun listOverrideSummary(choice: ReminderOverride, globalDefault: List<ReminderLead>, allDay: Boolean): String =
|
private fun listOverrideSummary(choice: ReminderOverride, globalDefault: List<ReminderLead>, allDay: Boolean): String =
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import dagger.hilt.android.lifecycle.HiltViewModel
|
|||||||
import de.jeanlucmakiola.agendula.data.appname.LauncherName
|
import de.jeanlucmakiola.agendula.data.appname.LauncherName
|
||||||
import de.jeanlucmakiola.agendula.data.appname.LauncherNameManager
|
import de.jeanlucmakiola.agendula.data.appname.LauncherNameManager
|
||||||
import de.jeanlucmakiola.agendula.data.di.IoDispatcher
|
import de.jeanlucmakiola.agendula.data.di.IoDispatcher
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.ReminderDescription
|
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.Settings
|
import de.jeanlucmakiola.agendula.data.prefs.Settings
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.SettingsPrefs
|
import de.jeanlucmakiola.agendula.data.prefs.SettingsPrefs
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.ThemeMode
|
import de.jeanlucmakiola.agendula.data.prefs.ThemeMode
|
||||||
@@ -189,6 +188,7 @@ class SettingsViewModel @Inject constructor(
|
|||||||
transferState.update { it.copy(confirming = false, running = true, outcome = null) }
|
transferState.update { it.copy(confirming = false, running = true, outcome = null) }
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
val result = externalImport.run()
|
val result = externalImport.run()
|
||||||
|
if (result is TransferResult.Copied) runCatching { reminderScheduler.sync() }
|
||||||
transferState.update {
|
transferState.update {
|
||||||
it.copy(
|
it.copy(
|
||||||
running = false,
|
running = false,
|
||||||
@@ -212,6 +212,7 @@ class SettingsViewModel @Inject constructor(
|
|||||||
retryingLegacyImport.value = true
|
retryingLegacyImport.value = true
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
runCatching { oneShotImport.reimportFromArchive() }
|
runCatching { oneShotImport.reimportFromArchive() }
|
||||||
|
runCatching { reminderScheduler.sync() }
|
||||||
retryingLegacyImport.value = false
|
retryingLegacyImport.value = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -260,7 +261,6 @@ class SettingsViewModel @Inject constructor(
|
|||||||
fun setTimeFormat(pref: TimeFormatPref) = viewModelScope.launch { prefs.setTimeFormat(pref) }
|
fun setTimeFormat(pref: TimeFormatPref) = viewModelScope.launch { prefs.setTimeFormat(pref) }
|
||||||
fun setWeekStart(day: DayOfWeek?) = viewModelScope.launch { prefs.setWeekStart(day) }
|
fun setWeekStart(day: DayOfWeek?) = viewModelScope.launch { prefs.setWeekStart(day) }
|
||||||
fun setSnoozeMinutes(minutes: Int) = viewModelScope.launch { prefs.setSnoozeMinutes(minutes) }
|
fun setSnoozeMinutes(minutes: Int) = viewModelScope.launch { prefs.setSnoozeMinutes(minutes) }
|
||||||
fun setReminderDescription(pref: ReminderDescription) = viewModelScope.launch { prefs.setReminderDescription(pref) }
|
|
||||||
fun setShowAddSubtaskRow(show: Boolean) = viewModelScope.launch { prefs.setShowAddSubtaskRow(show) }
|
fun setShowAddSubtaskRow(show: Boolean) = viewModelScope.launch { prefs.setShowAddSubtaskRow(show) }
|
||||||
fun setBottomAddBar(enabled: Boolean) = viewModelScope.launch { prefs.setBottomAddBar(enabled) }
|
fun setBottomAddBar(enabled: Boolean) = viewModelScope.launch { prefs.setBottomAddBar(enabled) }
|
||||||
fun setDefaultStartToday(enabled: Boolean) = viewModelScope.launch { prefs.setDefaultStartToday(enabled) }
|
fun setDefaultStartToday(enabled: Boolean) = viewModelScope.launch { prefs.setDefaultStartToday(enabled) }
|
||||||
|
|||||||
@@ -22,9 +22,6 @@ import androidx.compose.foundation.layout.PaddingValues
|
|||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.WindowInsets
|
import androidx.compose.foundation.layout.WindowInsets
|
||||||
import androidx.compose.foundation.layout.WindowInsetsSides
|
|
||||||
import androidx.compose.foundation.layout.displayCutout
|
|
||||||
import androidx.compose.foundation.layout.only
|
|
||||||
import androidx.compose.foundation.layout.ime
|
import androidx.compose.foundation.layout.ime
|
||||||
import androidx.compose.foundation.layout.isImeVisible
|
import androidx.compose.foundation.layout.isImeVisible
|
||||||
import androidx.compose.foundation.layout.navigationBars
|
import androidx.compose.foundation.layout.navigationBars
|
||||||
@@ -370,7 +367,7 @@ private fun TaskListBody(
|
|||||||
viewModel: TaskListViewModel,
|
viewModel: TaskListViewModel,
|
||||||
onClearCompleted: (() -> Unit)? = null,
|
onClearCompleted: (() -> Unit)? = null,
|
||||||
) {
|
) {
|
||||||
val (todayStart, todayEnd) = remember(state.tasks) { DayWindow.today(Clock.System.now(), ZoneId.systemDefault()) }
|
val (todayStart, todayEnd) = remember { DayWindow.today(Clock.System.now(), ZoneId.systemDefault()) }
|
||||||
// A parent represents its children via a progress chip (counts come from the
|
// A parent represents its children via a progress chip (counts come from the
|
||||||
// repository, over the full set), so drop children from the flat list — unless
|
// repository, over the full set), so drop children from the flat list — unless
|
||||||
// their parent isn't in this view (can happen in smart lists), where we keep
|
// their parent isn't in this view (can happen in smart lists), where we keep
|
||||||
@@ -379,9 +376,7 @@ private fun TaskListBody(
|
|||||||
val present = state.tasks.mapTo(HashSet()) { it.taskId }
|
val present = state.tasks.mapTo(HashSet()) { it.taskId }
|
||||||
state.tasks.filter { (it.parentId ?: 0L) <= 0L || it.parentId !in present }
|
state.tasks.filter { (it.parentId ?: 0L) <= 0L || it.parentId !in present }
|
||||||
}
|
}
|
||||||
val sections = remember(displayTasks, todayStart) {
|
val sections = remember(displayTasks) { TaskSections.of(displayTasks, todayStart, todayEnd) }
|
||||||
TaskSections.of(displayTasks, todayStart, todayEnd, todayList = filter == TaskFilter.Smart(SmartList.TODAY))
|
|
||||||
}
|
|
||||||
val showHeaders = sections.size > 1
|
val showHeaders = sections.size > 1
|
||||||
val listId = (filter as? TaskFilter.OfList)?.listId
|
val listId = (filter as? TaskFilter.OfList)?.listId
|
||||||
// In a mixed view (a smart list) the list colour bar + name disambiguate
|
// In a mixed view (a smart list) the list colour bar + name disambiguate
|
||||||
@@ -427,9 +422,7 @@ private fun TaskListBody(
|
|||||||
modifier = Modifier.fillMaxSize().then(viewport),
|
modifier = Modifier.fillMaxSize().then(viewport),
|
||||||
contentPadding = PaddingValues(
|
contentPadding = PaddingValues(
|
||||||
top = inner.calculateTopPadding() + 8.dp,
|
top = inner.calculateTopPadding() + 8.dp,
|
||||||
// While typing the viewport already ends above the bar or keyboard.
|
bottom = inner.calculateBottomPadding() + if (bottomBarShown) 16.dp else 96.dp,
|
||||||
bottom = (if (imeVisible) 0.dp else inner.calculateBottomPadding()) +
|
|
||||||
if (bottomBarShown) 16.dp else 96.dp,
|
|
||||||
),
|
),
|
||||||
) {
|
) {
|
||||||
if (state.tasks.isEmpty()) {
|
if (state.tasks.isEmpty()) {
|
||||||
@@ -623,11 +616,7 @@ private fun QuickAddBar(onAdd: (String) -> Unit) {
|
|||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.windowInsetsPadding(
|
.windowInsetsPadding(WindowInsets.ime.union(WindowInsets.navigationBars)),
|
||||||
WindowInsets.ime
|
|
||||||
.union(WindowInsets.navigationBars)
|
|
||||||
.union(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal)),
|
|
||||||
),
|
|
||||||
) {
|
) {
|
||||||
InlineAdd(onAdd = onAdd, elevated = true)
|
InlineAdd(onAdd = onAdd, elevated = true)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
package de.jeanlucmakiola.agendula.ui.theme
|
|
||||||
|
|
||||||
import android.app.Activity
|
|
||||||
import android.app.UiModeManager
|
|
||||||
import android.os.Build
|
|
||||||
import androidx.annotation.StyleRes
|
|
||||||
import de.jeanlucmakiola.agendula.R
|
|
||||||
import de.jeanlucmakiola.agendula.data.prefs.ThemeMode
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hands the app's theme setting to the system, which draws the launch window
|
|
||||||
* and splash before any of the app runs (#119). The system keeps both across
|
|
||||||
* launches, so the next start already matches.
|
|
||||||
*/
|
|
||||||
object SystemTheme {
|
|
||||||
|
|
||||||
/** The light or dark the app's resources follow, as [UiModeManager.setApplicationNightMode] takes it. */
|
|
||||||
fun nightModeOf(mode: ThemeMode): Int = when (mode) {
|
|
||||||
ThemeMode.SYSTEM -> UiModeManager.MODE_NIGHT_AUTO
|
|
||||||
ThemeMode.LIGHT -> UiModeManager.MODE_NIGHT_NO
|
|
||||||
ThemeMode.DARK, ThemeMode.BLACK -> UiModeManager.MODE_NIGHT_YES
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The splash theme whose background is the one the app opens on. */
|
|
||||||
@StyleRes
|
|
||||||
fun splashThemeOf(mode: ThemeMode, dynamicColor: Boolean): Int = when {
|
|
||||||
mode.isPureBlack -> R.style.Theme_Agendula_Black
|
|
||||||
dynamicColor -> R.style.Theme_Agendula
|
|
||||||
else -> R.style.Theme_Agendula_Fallback
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Applies [mode] and [dynamicColor]. A night mode the activity does not
|
|
||||||
* have yet recreates it, once; the same one again changes nothing.
|
|
||||||
*/
|
|
||||||
fun apply(activity: Activity, mode: ThemeMode, dynamicColor: Boolean) {
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
|
||||||
activity.getSystemService(UiModeManager::class.java)?.setApplicationNightMode(nightModeOf(mode))
|
|
||||||
}
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
|
||||||
activity.splashScreen.setSplashScreenTheme(splashThemeOf(mode, dynamicColor))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -194,12 +194,10 @@ private fun TaskWidgetBody(
|
|||||||
Spacer(GlanceModifier.height(R.dimen.widget_tasks_header_gap_tight))
|
Spacer(GlanceModifier.height(R.dimen.widget_tasks_header_gap_tight))
|
||||||
WidgetDoneState(context.getString(R.string.widget_empty), context.getString(R.string.widget_empty_hint))
|
WidgetDoneState(context.getString(R.string.widget_empty), context.getString(R.string.widget_empty_hint))
|
||||||
} else {
|
} else {
|
||||||
val todayList = filter == TaskFilter.Smart(SmartList.TODAY)
|
|
||||||
val allSections = widgetSections(
|
val allSections = widgetSections(
|
||||||
data.rows,
|
data.rows,
|
||||||
data.groupByList,
|
data.groupByList,
|
||||||
data.listNames,
|
data.listNames,
|
||||||
todayList,
|
|
||||||
) { kind -> context.getString(dueBucketLabel(kind)) }
|
) { kind -> context.getString(dueBucketLabel(kind)) }
|
||||||
// A lone group whose bucket repeats the widget's own smart list
|
// A lone group whose bucket repeats the widget's own smart list
|
||||||
// (the "Today" smart list showing one "Today" bucket) earns no
|
// (the "Today" smart list showing one "Today" bucket) earns no
|
||||||
@@ -250,8 +248,7 @@ private fun TaskWidgetBody(
|
|||||||
// (Today / Tomorrow) whenever one is shown — and when
|
// (Today / Tomorrow) whenever one is shown — and when
|
||||||
// it isn't, that's only because it would have repeated
|
// it isn't, that's only because it would have repeated
|
||||||
// the title, which names the same day just as well.
|
// the title, which names the same day just as well.
|
||||||
suppressDayLabel = !data.groupByList &&
|
suppressDayLabel = !data.groupByList,
|
||||||
(!todayList || section.row.dueKind == DueKind.TODAY),
|
|
||||||
)
|
)
|
||||||
Spacer(GlanceModifier.height(8.dp))
|
Spacer(GlanceModifier.height(8.dp))
|
||||||
}
|
}
|
||||||
@@ -307,9 +304,7 @@ private fun TaskWidgetHeader(title: String, filter: TaskFilter, singleListId: Lo
|
|||||||
WidgetHeaderAction(
|
WidgetHeaderAction(
|
||||||
icon = ImageProvider(GlanceR.drawable.floret_ic_widget_add),
|
icon = ImageProvider(GlanceR.drawable.floret_ic_widget_add),
|
||||||
contentDescription = context.getString(R.string.new_task),
|
contentDescription = context.getString(R.string.new_task),
|
||||||
action = actionStartActivity(
|
action = actionStartActivity(MainActivity.newTaskIntent(context, singleListId)),
|
||||||
MainActivity.newTaskIntent(context, singleListId, dueToday = filter == TaskFilter.Smart(SmartList.TODAY)),
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,11 +3,14 @@ package de.jeanlucmakiola.agendula.widget
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import dagger.hilt.android.qualifiers.ApplicationContext
|
import dagger.hilt.android.qualifiers.ApplicationContext
|
||||||
import de.jeanlucmakiola.agendula.data.di.ApplicationScope
|
import de.jeanlucmakiola.agendula.data.di.ApplicationScope
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.StoreChangeDebouncer
|
|
||||||
import de.jeanlucmakiola.agendula.data.tasks.TasksDataSource
|
import de.jeanlucmakiola.agendula.data.tasks.TasksDataSource
|
||||||
import de.jeanlucmakiola.floret.glance.WidgetRollover
|
import de.jeanlucmakiola.floret.glance.WidgetRollover
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.FlowPreview
|
||||||
|
import kotlinx.coroutines.channels.Channel
|
||||||
|
import kotlinx.coroutines.flow.debounce
|
||||||
|
import kotlinx.coroutines.flow.receiveAsFlow
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
import javax.inject.Singleton
|
import javax.inject.Singleton
|
||||||
@@ -23,10 +26,16 @@ class TaskWidgetUpdater @Inject constructor(
|
|||||||
private val dataSource: TasksDataSource,
|
private val dataSource: TasksDataSource,
|
||||||
@ApplicationScope private val scope: CoroutineScope,
|
@ApplicationScope private val scope: CoroutineScope,
|
||||||
) {
|
) {
|
||||||
private val changes = StoreChangeDebouncer(scope, DEBOUNCE_MILLIS, dataSource::registerObserver, ::redraw)
|
private val requests = Channel<Unit>(Channel.CONFLATED)
|
||||||
|
private var observer: AutoCloseable? = null
|
||||||
|
|
||||||
|
@OptIn(FlowPreview::class)
|
||||||
fun start() {
|
fun start() {
|
||||||
if (!changes.start()) return
|
if (observer != null) return
|
||||||
|
observer = runCatching { dataSource.registerObserver { requests.trySend(Unit) } }.getOrNull()
|
||||||
|
scope.launch(Dispatchers.IO) {
|
||||||
|
requests.receiveAsFlow().debounce(DEBOUNCE_MILLIS).collect { redraw() }
|
||||||
|
}
|
||||||
scope.launch(Dispatchers.IO) {
|
scope.launch(Dispatchers.IO) {
|
||||||
runCatching { WidgetRollover.sync(context, WIDGET_RECEIVER_CLASSES, ::widgetRolloverPendingIntent) }
|
runCatching { WidgetRollover.sync(context, WIDGET_RECEIVER_CLASSES, ::widgetRolloverPendingIntent) }
|
||||||
}
|
}
|
||||||
@@ -35,7 +44,9 @@ class TaskWidgetUpdater @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Redraw soon; bursts collapse into one pass. */
|
/** Redraw soon; bursts collapse into one pass. */
|
||||||
fun requestRefresh() = changes.request()
|
fun requestRefresh() {
|
||||||
|
requests.trySend(Unit)
|
||||||
|
}
|
||||||
|
|
||||||
private suspend fun redraw() {
|
private suspend fun redraw() {
|
||||||
runCatching {
|
runCatching {
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ private fun TodayWidgetBody(data: WidgetStatsData?, background: WidgetBackground
|
|||||||
WidgetHeaderAction(
|
WidgetHeaderAction(
|
||||||
icon = ImageProvider(GlanceR.drawable.floret_ic_widget_add),
|
icon = ImageProvider(GlanceR.drawable.floret_ic_widget_add),
|
||||||
contentDescription = context.getString(R.string.new_task),
|
contentDescription = context.getString(R.string.new_task),
|
||||||
action = actionStartActivity(MainActivity.newTaskIntent(context, dueToday = true)),
|
action = actionStartActivity(MainActivity.newTaskIntent(context)),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Spacer(GlanceModifier.height(HeaderGap))
|
Spacer(GlanceModifier.height(HeaderGap))
|
||||||
|
|||||||
@@ -200,14 +200,12 @@ private fun headedRuns(runs: List<WidgetRun>): List<WidgetSection> =
|
|||||||
* (already sorted that way by [widgetRows]), otherwise one per [DueKind]
|
* (already sorted that way by [widgetRows]), otherwise one per [DueKind]
|
||||||
* bucket — "Overdue" / "Today" / "Tomorrow" / "Later" / "No date" — in that
|
* bucket — "Overdue" / "Today" / "Tomorrow" / "Later" / "No date" — in that
|
||||||
* fixed order, since [rows] isn't due-sorted. Each run becomes one header
|
* fixed order, since [rows] isn't due-sorted. Each run becomes one header
|
||||||
* followed by its own standalone, independently coloured task pills. The Today
|
* followed by its own standalone, independently coloured task pills.
|
||||||
* list ([todayList]) is one "Today" bucket, as a row may be there by its start.
|
|
||||||
*/
|
*/
|
||||||
internal fun widgetSections(
|
internal fun widgetSections(
|
||||||
rows: List<WidgetTaskRow>,
|
rows: List<WidgetTaskRow>,
|
||||||
groupByList: Boolean,
|
groupByList: Boolean,
|
||||||
listNames: Map<Long, String>,
|
listNames: Map<Long, String>,
|
||||||
todayList: Boolean = false,
|
|
||||||
dueBucketLabel: (DueKind?) -> String,
|
dueBucketLabel: (DueKind?) -> String,
|
||||||
): List<WidgetSection> {
|
): List<WidgetSection> {
|
||||||
if (groupByList) {
|
if (groupByList) {
|
||||||
@@ -222,7 +220,7 @@ internal fun widgetSections(
|
|||||||
}
|
}
|
||||||
return headedRuns(runs)
|
return headedRuns(runs)
|
||||||
}
|
}
|
||||||
val buckets = rows.groupBy { if (todayList) DueKind.TODAY else it.dueKind }
|
val buckets = rows.groupBy { it.dueKind }
|
||||||
val runs = DueKind.entries.plus(null).mapNotNull { kind ->
|
val runs = DueKind.entries.plus(null).mapNotNull { kind ->
|
||||||
buckets[kind]?.takeIf { it.isNotEmpty() }
|
buckets[kind]?.takeIf { it.isNotEmpty() }
|
||||||
?.let { WidgetRun("due:${kind?.name.orEmpty()}", dueBucketLabel(kind), it) }
|
?.let { WidgetRun("due:${kind?.name.orEmpty()}", dueBucketLabel(kind), it) }
|
||||||
|
|||||||
@@ -7,11 +7,9 @@ import de.jeanlucmakiola.agendula.data.prefs.is24Hour
|
|||||||
import de.jeanlucmakiola.agendula.domain.SmartList
|
import de.jeanlucmakiola.agendula.domain.SmartList
|
||||||
import de.jeanlucmakiola.agendula.domain.Task
|
import de.jeanlucmakiola.agendula.domain.Task
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskFilter
|
import de.jeanlucmakiola.agendula.domain.TaskFilter
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskFiltering
|
|
||||||
import de.jeanlucmakiola.agendula.domain.TaskList
|
import de.jeanlucmakiola.agendula.domain.TaskList
|
||||||
import de.jeanlucmakiola.agendula.domain.calendarDate
|
import de.jeanlucmakiola.agendula.domain.calendarDate
|
||||||
import de.jeanlucmakiola.agendula.domain.comparator
|
import de.jeanlucmakiola.agendula.domain.comparator
|
||||||
import de.jeanlucmakiola.floret.time.DayWindow
|
|
||||||
import kotlinx.coroutines.flow.Flow
|
import kotlinx.coroutines.flow.Flow
|
||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.combine
|
import kotlinx.coroutines.flow.combine
|
||||||
@@ -47,15 +45,10 @@ internal sealed interface WidgetStatsData {
|
|||||||
|
|
||||||
private const val MAX_TODAY_ROWS = 20
|
private const val MAX_TODAY_ROWS = 20
|
||||||
|
|
||||||
/** Whether this open task is on the Today widget's plate: in the app's Today, or overdue. */
|
|
||||||
private fun Task.isDueToday(now: Instant, today: LocalDate, todayStart: Instant, todayEnd: Instant, zone: ZoneId): Boolean =
|
|
||||||
TaskFiltering.isToday(this, todayStart, todayEnd, zone) ||
|
|
||||||
due?.let { isOverdue(it, isAllDay, now, today, zone) } == true
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* How far through today a set of [open] and [completed] tasks says you are:
|
* How far through today a set of [open] and [completed] tasks says you are:
|
||||||
* the app's Today tasks done and still open ([TaskFiltering.isToday]) plus the
|
* tasks done today (by [Task.completedAt]'s local date), tasks still open that
|
||||||
* overdue ones, the open ones in [comparator] order, and those tasks as rows.
|
* are overdue or due today (in [comparator] order), and those tasks as rows.
|
||||||
*/
|
*/
|
||||||
internal fun todayProgress(
|
internal fun todayProgress(
|
||||||
open: List<Task>,
|
open: List<Task>,
|
||||||
@@ -65,9 +58,14 @@ internal fun todayProgress(
|
|||||||
today: LocalDate,
|
today: LocalDate,
|
||||||
zone: ZoneId,
|
zone: ZoneId,
|
||||||
): Triple<Int, Int, List<WidgetTaskRow>> {
|
): Triple<Int, Int, List<WidgetTaskRow>> {
|
||||||
val (todayStart, todayEnd) = DayWindow.today(now, zone)
|
val done = completed.count { task ->
|
||||||
val done = completed.count { TaskFiltering.isToday(it, todayStart, todayEnd, zone) }
|
val at = task.completedAt ?: return@count false
|
||||||
val remaining = open.filter { it.isDueToday(now, today, todayStart, todayEnd, zone) }.sortedWith(comparator)
|
at.toLocalDate(zone) == today
|
||||||
|
}
|
||||||
|
val remaining = open.filter { task ->
|
||||||
|
val due = task.due ?: return@filter false
|
||||||
|
isOverdue(due, task.isAllDay, now, today, zone) || dueKind(due, task.isAllDay, today, zone) == DueKind.TODAY
|
||||||
|
}.sortedWith(comparator)
|
||||||
return Triple(done, remaining.size, remaining.take(MAX_TODAY_ROWS).map { it.toWidgetRow(now, today, zone) })
|
return Triple(done, remaining.size, remaining.take(MAX_TODAY_ROWS).map { it.toWidgetRow(now, today, zone) })
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -78,29 +76,29 @@ internal fun upcoming(open: List<Task>, now: Instant, today: LocalDate, zone: Zo
|
|||||||
private const val MAX_UPCOMING_ROWS = 200
|
private const val MAX_UPCOMING_ROWS = 200
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Seven [WeekDay]s starting at [today]. Today's bucket holds what the Today
|
* Seven [WeekDay]s starting at [today]. Today's bucket folds in every overdue
|
||||||
* widget counts — the app's Today tasks plus every overdue one; every other day
|
* task regardless of its own due day, since that's where the app's own
|
||||||
* holds the rest by their own due date.
|
* Overdue/Today smart lists put it; every other day matches its own due date.
|
||||||
*/
|
*/
|
||||||
internal fun weekDays(open: List<Task>, comparator: Comparator<Task>, now: Instant, today: LocalDate, zone: ZoneId): List<WeekDay> {
|
internal fun weekDays(open: List<Task>, comparator: Comparator<Task>, now: Instant, today: LocalDate, zone: ZoneId): List<WeekDay> =
|
||||||
val (todayStart, todayEnd) = DayWindow.today(now, zone)
|
(0..6L).map { offset ->
|
||||||
val (todays, later) = open.partition { it.isDueToday(now, today, todayStart, todayEnd, zone) }
|
|
||||||
return (0..6L).map { offset ->
|
|
||||||
val date = today.plusDays(offset)
|
val date = today.plusDays(offset)
|
||||||
val dayTasks = if (offset == 0L) {
|
val dayTasks = open.filter { task ->
|
||||||
todays
|
val due = task.due ?: return@filter false
|
||||||
|
if (offset == 0L) {
|
||||||
|
isOverdue(due, task.isAllDay, now, today, zone) || due.calendarDate(task.isAllDay, zone) == date
|
||||||
} else {
|
} else {
|
||||||
later.filter { task -> task.due?.calendarDate(task.isAllDay, zone) == date }
|
due.calendarDate(task.isAllDay, zone) == date
|
||||||
|
}
|
||||||
}
|
}
|
||||||
val overdueCount = if (offset == 0L) {
|
val overdueCount = if (offset == 0L) {
|
||||||
dayTasks.count { task -> task.due?.let { isOverdue(it, task.isAllDay, now, today, zone) } == true }
|
dayTasks.count { isOverdue(it.due!!, it.isAllDay, now, today, zone) }
|
||||||
} else {
|
} else {
|
||||||
0
|
0
|
||||||
}
|
}
|
||||||
val first = dayTasks.sortedWith(comparator).firstOrNull()?.toWidgetRow(now, today, zone)
|
val first = dayTasks.sortedWith(comparator).firstOrNull()?.toWidgetRow(now, today, zone)
|
||||||
WeekDay(date, dayTasks.size, overdueCount, first)
|
WeekDay(date, dayTasks.size, overdueCount, first)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/** One tile per visible list: its open, non-subtask count — a subtask whose parent is also open is left out. */
|
/** One tile per visible list: its open, non-subtask count — a subtask whose parent is also open is left out. */
|
||||||
internal fun listTiles(open: List<Task>, lists: List<TaskList>): List<ListTile> {
|
internal fun listTiles(open: List<Task>, lists: List<TaskList>): List<ListTile> {
|
||||||
|
|||||||
@@ -55,8 +55,8 @@
|
|||||||
<string name="settings_theme">السمة</string>
|
<string name="settings_theme">السمة</string>
|
||||||
<string name="settings_theme_light">فاتح</string>
|
<string name="settings_theme_light">فاتح</string>
|
||||||
<string name="settings_theme_dark">داكن</string>
|
<string name="settings_theme_dark">داكن</string>
|
||||||
<string name="settings_section_reminders">الإشعارات</string>
|
<string name="settings_section_reminders">التذكيرات</string>
|
||||||
<string name="settings_list_notifications">الصوت والاهتزاز</string>
|
<string name="settings_list_notifications">الإشعارات</string>
|
||||||
<string name="settings_group_data">البيانات</string>
|
<string name="settings_group_data">البيانات</string>
|
||||||
<string name="settings_group_app">التطبيق</string>
|
<string name="settings_group_app">التطبيق</string>
|
||||||
<string name="settings_group_about">حول</string>
|
<string name="settings_group_about">حول</string>
|
||||||
@@ -65,7 +65,7 @@
|
|||||||
<string name="settings_section_storage">التخزين</string>
|
<string name="settings_section_storage">التخزين</string>
|
||||||
<string name="settings_section_accounts">الحسابات</string>
|
<string name="settings_section_accounts">الحسابات</string>
|
||||||
<string name="settings_list_reminder_inherits">الافتراضي (%1$s)</string>
|
<string name="settings_list_reminder_inherits">الافتراضي (%1$s)</string>
|
||||||
<string name="settings_section_task_form">نموذج مهمة جديدة</string>
|
<string name="settings_section_task_form">نموذج مهمة</string>
|
||||||
<string name="settings_about_support">دَعم التطوير</string>
|
<string name="settings_about_support">دَعم التطوير</string>
|
||||||
<string name="settings_about_version">الإصدار %1$s</string>
|
<string name="settings_about_version">الإصدار %1$s</string>
|
||||||
<string name="settings_language">لغة التطبيق</string>
|
<string name="settings_language">لغة التطبيق</string>
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
<string name="settings_translate">المساعدة في الترجمة</string>
|
<string name="settings_translate">المساعدة في الترجمة</string>
|
||||||
<string name="settings_theme_system">اتباع النظام</string>
|
<string name="settings_theme_system">اتباع النظام</string>
|
||||||
<string name="settings_dynamic_color">اللون الديناميكي</string>
|
<string name="settings_dynamic_color">اللون الديناميكي</string>
|
||||||
<string name="settings_reminders">تذكيرات المهام</string>
|
<string name="settings_reminders">التذكيرات المستحقة</string>
|
||||||
<string name="settings_exact_alarms">التوقيت الدقيق</string>
|
<string name="settings_exact_alarms">التوقيت الدقيق</string>
|
||||||
<string name="settings_default_list">القائمة الافتراضية</string>
|
<string name="settings_default_list">القائمة الافتراضية</string>
|
||||||
<string name="settings_time_format">تنسيق الوقت</string>
|
<string name="settings_time_format">تنسيق الوقت</string>
|
||||||
@@ -90,7 +90,7 @@
|
|||||||
<string name="settings_about_author">بواسطة Jean-Luc Makiola</string>
|
<string name="settings_about_author">بواسطة Jean-Luc Makiola</string>
|
||||||
<string name="settings_about_logo_desc">رمز تطبيق Agendula</string>
|
<string name="settings_about_logo_desc">رمز تطبيق Agendula</string>
|
||||||
<string name="settings_report_problem">الإبلاغ عن مشكلة</string>
|
<string name="settings_report_problem">الإبلاغ عن مشكلة</string>
|
||||||
<string name="settings_default_reminder">التذكير الافتراضي</string>
|
<string name="settings_default_reminder">متى لتذكير</string>
|
||||||
<string name="settings_group_look">المظهر و السلوك</string>
|
<string name="settings_group_look">المظهر و السلوك</string>
|
||||||
<string name="settings_bottom_add_bar">شريط الإضافة السريع السفلي</string>
|
<string name="settings_bottom_add_bar">شريط الإضافة السريع السفلي</string>
|
||||||
<string name="settings_time_format_12h">١٢-ساعة (٢:٠٠ م)</string>
|
<string name="settings_time_format_12h">١٢-ساعة (٢:٠٠ م)</string>
|
||||||
@@ -168,7 +168,7 @@
|
|||||||
<string name="reminder_unit_days">أيام</string>
|
<string name="reminder_unit_days">أيام</string>
|
||||||
<string name="reminder_unit_weeks">أسابيع</string>
|
<string name="reminder_unit_weeks">أسابيع</string>
|
||||||
<string name="settings_list_reminders_title">التذكيرات لكل قائمة</string>
|
<string name="settings_list_reminders_title">التذكيرات لكل قائمة</string>
|
||||||
<string name="settings_list_reminders_hint">تجاوز الافتراضي لكل قائمة — بشكل منفصل للمحدد بوقت ومهام طوال اليوم. يمكن لقائمة الاحتفاظ بالافتراضي، إسقاطه أو تعيين خاصّته.</string>
|
<string name="settings_list_reminders_hint">تجاوز التذكير الافتراضي للقوائم الفردية</string>
|
||||||
<string name="lists_reorder_handle">اسحب لإعادة الترتيب</string>
|
<string name="lists_reorder_handle">اسحب لإعادة الترتيب</string>
|
||||||
<string name="settings_list_notifications_hint">الصوت، الاهتزاز و الأهمية لتذكيرات هذه القائمة</string>
|
<string name="settings_list_notifications_hint">الصوت، الاهتزاز و الأهمية لتذكيرات هذه القائمة</string>
|
||||||
<string name="smart_today">اليوم</string>
|
<string name="smart_today">اليوم</string>
|
||||||
@@ -446,8 +446,8 @@
|
|||||||
<string name="filter_missing">تم حذف عامل التصفية</string>
|
<string name="filter_missing">تم حذف عامل التصفية</string>
|
||||||
<string name="view_filter_tags">تصفية حسب الوسم</string>
|
<string name="view_filter_tags">تصفية حسب الوسم</string>
|
||||||
<string name="filter_section_lists">القوائم</string>
|
<string name="filter_section_lists">القوائم</string>
|
||||||
<string name="settings_appearance_subtitle">السمة، الألوان، تنسيق الوقت</string>
|
<string name="settings_appearance_subtitle">السمة، اللون و تنسيق الوقت</string>
|
||||||
<string name="settings_task_form_subtitle">الخانات الافتراضية و السلوك</string>
|
<string name="settings_task_form_subtitle">الحقول، القائمة والمهام الفرعية الافتراضية</string>
|
||||||
<string name="recurrence_on_days">%1$s في %2$s</string>
|
<string name="recurrence_on_days">%1$s في %2$s</string>
|
||||||
<string name="recurrence_with_until">%1$s حتى %2$s</string>
|
<string name="recurrence_with_until">%1$s حتى %2$s</string>
|
||||||
<plurals name="recurrence_with_count">
|
<plurals name="recurrence_with_count">
|
||||||
@@ -521,7 +521,7 @@
|
|||||||
<string name="add_account_server_title">أين مهامك؟</string>
|
<string name="add_account_server_title">أين مهامك؟</string>
|
||||||
<string name="add_account_working_reading_lists">جاري قراءة قوائم المهام خاصّتك</string>
|
<string name="add_account_working_reading_lists">جاري قراءة قوائم المهام خاصّتك</string>
|
||||||
<string name="add_account_browser_title">جاري الانتظار لمتصفحك</string>
|
<string name="add_account_browser_title">جاري الانتظار لمتصفحك</string>
|
||||||
<string name="add_account_browser_use_password">استخدم كلمة مرور بدلاً من ذلك</string>
|
<string name="add_account_browser_use_password">استخدم كلمة مرور بدلاً</string>
|
||||||
<string name="add_account_browser_open">فتح صفحة تسجيل الدخول</string>
|
<string name="add_account_browser_open">فتح صفحة تسجيل الدخول</string>
|
||||||
<string name="add_account_lists_title">أيّ القوائم يجب المزامنة؟</string>
|
<string name="add_account_lists_title">أيّ القوائم يجب المزامنة؟</string>
|
||||||
<string name="add_account_provider_unsupported">لا دعم للمهام عبر CalDAV</string>
|
<string name="add_account_provider_unsupported">لا دعم للمهام عبر CalDAV</string>
|
||||||
@@ -569,7 +569,7 @@
|
|||||||
<string name="add_account_browser_error_expired">تم إغلاق نافذة الموافقة قبل أن يرد الخادم.</string>
|
<string name="add_account_browser_error_expired">تم إغلاق نافذة الموافقة قبل أن يرد الخادم.</string>
|
||||||
<string name="add_account_browser_error_rate_limited">يرفض الخادم المحاولات المتكررة. انتظر بضع دقائق وحاول مرة أخرى.</string>
|
<string name="add_account_browser_error_rate_limited">يرفض الخادم المحاولات المتكررة. انتظر بضع دقائق وحاول مرة أخرى.</string>
|
||||||
<string name="add_account_browser_error_maintenance">الخادم في وضع الصيانة. حاول مرة أخرى بمجرد عودته.</string>
|
<string name="add_account_browser_error_maintenance">الخادم في وضع الصيانة. حاول مرة أخرى بمجرد عودته.</string>
|
||||||
<string name="add_account_browser_error_unavailable">لا يحتوي هذا الجهاز على متصفح يمكنه فتح صفحة تسجيل الدخول. استخدم كلمة مرور بدلاً من ذلك.</string>
|
<string name="add_account_browser_error_unavailable">لا يحتوي هذا الجهاز على متصفح يمكنه فتح صفحة تسجيل الدخول. استخدم كلمة مرور بدلاً.</string>
|
||||||
<string name="add_account_quirk_hint_fastmail">يحتاج Fastmail كلمة مرور تطبيق، ليس كلمة مرور حسابك — وCalDAV ليس على الخطة الأساسية.</string>
|
<string name="add_account_quirk_hint_fastmail">يحتاج Fastmail كلمة مرور تطبيق، ليس كلمة مرور حسابك — وCalDAV ليس على الخطة الأساسية.</string>
|
||||||
<string name="add_account_quirk_hint_icloud">يحتاج iCloud كلمة مرور خاصة بتطبيق، التي يمكنك إنشاؤها في appleid.apple.com مع تفعيل المصادقة الثنائية.</string>
|
<string name="add_account_quirk_hint_icloud">يحتاج iCloud كلمة مرور خاصة بتطبيق، التي يمكنك إنشاؤها في appleid.apple.com مع تفعيل المصادقة الثنائية.</string>
|
||||||
<string name="add_account_setup_body">ستقوم بذلك في متصفحك، ثم العودة هنا لإكمال.</string>
|
<string name="add_account_setup_body">ستقوم بذلك في متصفحك، ثم العودة هنا لإكمال.</string>
|
||||||
@@ -580,7 +580,7 @@
|
|||||||
<string name="add_account_browser_body">وافق على Agendula في المتصفح، ثم ارجع هنا. لا يتم إرسال كلمة مرورك مطلقًا إلى هذا التطبيق — يصدر الخادم كلمة مرور تطبيق منفصلة يمكنك إلغاؤها في أي وقت.</string>
|
<string name="add_account_browser_body">وافق على Agendula في المتصفح، ثم ارجع هنا. لا يتم إرسال كلمة مرورك مطلقًا إلى هذا التطبيق — يصدر الخادم كلمة مرور تطبيق منفصلة يمكنك إلغاؤها في أي وقت.</string>
|
||||||
<string name="add_account_browser_insecure">صفحة تسجيل الدخول هذه غير مشفرة (http). أي شيء تكتبه هناك، بما في ذلك كلمة مرور حسابك، ينتقل بشكل غير مشفر.</string>
|
<string name="add_account_browser_insecure">صفحة تسجيل الدخول هذه غير مشفرة (http). أي شيء تكتبه هناك، بما في ذلك كلمة مرور حسابك، ينتقل بشكل غير مشفر.</string>
|
||||||
<string name="add_account_browser_host_mismatch">الخادم أرسلنا إلى %1$s، لكنك كتبت %2$s. يعني ذلك عادةً أن إعداد overwrite.cli.url خاصّته غير صحيح.</string>
|
<string name="add_account_browser_host_mismatch">الخادم أرسلنا إلى %1$s، لكنك كتبت %2$s. يعني ذلك عادةً أن إعداد overwrite.cli.url خاصّته غير صحيح.</string>
|
||||||
<string name="add_account_origin_mismatch">أبلغ الخادم عن عنوانه كـ %1$s، الذي لا يستطيع هذا الجهاز الوصول، لذلك تم استخدام %2$s بدلاً من ذلك. من المحتمل أن يكون إعداد overwrite.cli.url أو trusted_proxies خاصّته غير صحيح.</string>
|
<string name="add_account_origin_mismatch">أبلغ الخادم عن عنوانه كـ %1$s، الذي لا يستطيع هذا الجهاز الوصول، لذلك تم استخدام %2$s بدلاً. من المحتمل أن يكون إعداد overwrite.cli.url أو trusted_proxies خاصّته غير صحيح.</string>
|
||||||
<string name="settings_licences_subtitle">المشاريع التي بنيت Agendula عليها</string>
|
<string name="settings_licences_subtitle">المشاريع التي بنيت Agendula عليها</string>
|
||||||
<string name="licences_intro">يتضمن Agendula العمل أدناه. اضغط على أي إدخال للحصول على شفرة المصدر الخاصة به.</string>
|
<string name="licences_intro">يتضمن Agendula العمل أدناه. اضغط على أي إدخال للحصول على شفرة المصدر الخاصة به.</string>
|
||||||
<string name="licences_footer">يتم تضمين بعض من هذا الكود في شكل معدل. أين يكون هذا هو الحال، يتم إدراج كل تغيير في مستودع المصدر المرتبط أعلاه.</string>
|
<string name="licences_footer">يتم تضمين بعض من هذا الكود في شكل معدل. أين يكون هذا هو الحال، يتم إدراج كل تغيير في مستودع المصدر المرتبط أعلاه.</string>
|
||||||
@@ -661,197 +661,4 @@
|
|||||||
<string name="list_save_failed_server">الخادم لن يقبل هذا التغيير.</string>
|
<string name="list_save_failed_server">الخادم لن يقبل هذا التغيير.</string>
|
||||||
<string name="list_delete_confirm_message">سيتم حذف ”%1$s“ وجميع مهامه. هذا لا يمكن التراجع عنه.</string>
|
<string name="list_delete_confirm_message">سيتم حذف ”%1$s“ وجميع مهامه. هذا لا يمكن التراجع عنه.</string>
|
||||||
<string name="lists_empty_action">إنشاء قائمة</string>
|
<string name="lists_empty_action">إنشاء قائمة</string>
|
||||||
<string name="settings_dynamic_color_unavailable">متوفر على أندوريد ١٢ و أحدث</string>
|
|
||||||
<string name="settings_reminders_subtitle">التذكيرات و التسليم</string>
|
|
||||||
<string name="settings_form_fields_hint">الخانات المعروضة افتراضيًا على مهمة جديدة. الباقية تقع ضمن \"المزيد من الخانات\".</string>
|
|
||||||
<string name="settings_dynamic_color_hint">استخدام الألوان من خلفيتك</string>
|
|
||||||
<string name="settings_export_hint">حفظ قوائمك كملفات iCalendar</string>
|
|
||||||
<string name="settings_import_hint">إحضار المهام من ملف iCalendar</string>
|
|
||||||
<string name="settings_autofocus_title">تركيز العنوان على مهمة جديدة</string>
|
|
||||||
<string name="settings_autofocus_title_hint">عند بدء مهمة جديدة، ضع المؤشر في حقل العنوان وافتح لوحة المفاتيح على الفور.</string>
|
|
||||||
<string name="settings_storage_subtitle">أين مهامك تُبقى</string>
|
|
||||||
<string name="settings_allday_reminder_time">وقت تذكير اليوم الكامل</string>
|
|
||||||
<string name="settings_reliable_delivery_hint">أندرويد قد يؤخر التذكيرات لتوفير البطارية. استثنِ Agendula لكي تصل في الوقت المحدد.</string>
|
|
||||||
<string name="settings_reliable_delivery_exempt">معفى من تحسين البطارية — تصل التذكيرات في الوقت المحدّد.</string>
|
|
||||||
<string name="settings_translate_hint">إضافة أو تحسين لغة على Weblate</string>
|
|
||||||
<string name="settings_reminders_hint">أعلمني عندما تكون مهمة مستحقة</string>
|
|
||||||
<string name="settings_exact_alarms_allowed">تنطلق التذكيرات في الوقت المحدّد</string>
|
|
||||||
<string name="settings_notifications_blocked_hint">التذكيرات لا يمكنها الوصول لك. اضغط للسماح بإشعارات لـ Agendula.</string>
|
|
||||||
<string name="settings_exact_alarms_blocked">محظور — اضغط للسماح بالتذكيرات الدقيقة</string>
|
|
||||||
<string name="settings_default_list_first">أول قائمة متاحة</string>
|
|
||||||
<string name="settings_add_subtask_row">إظهار صف \"أضف مهمة فرعية\"</string>
|
|
||||||
<string name="settings_add_subtask_row_hint">خانة إضافة في نهاية المهام الفرعية للمهمة الموسعة</string>
|
|
||||||
<string name="settings_default_start_today">البداية الافتراضية إلى اليوم</string>
|
|
||||||
<string name="settings_default_start_today_hint">ملأ مسبق بداية مهمة جديدة بتاريخ اليوم</string>
|
|
||||||
<string name="settings_bottom_add_bar_hint">إضافة مهام من شريط مثبت إلى أسفل لقائمة، بدلاً من الزر العائم</string>
|
|
||||||
<string name="settings_task_store_hint">كل مخزن يحتفظ بمهامه الخاصة. التبديل لا يؤدي لنقلهم — انسخهم أولاً، أو صدِّرهم من النسخ الاحتياطي والاستعادة.</string>
|
|
||||||
<string name="settings_store_own_hint">التخزين خاصّة Agendula. لا شيء آخر للتثبيت.</string>
|
|
||||||
<string name="settings_store_external_hint">مشاركة المهام مع التطبيق الذي يزامنهم</string>
|
|
||||||
<string name="settings_store_external_missing">لا تطبيق مهام متوافق مثبّت</string>
|
|
||||||
<string name="accounts_remove_wipe">إزالة و حذف المهام</string>
|
|
||||||
<string name="list_delete_confirm_message_synced">”%1$s“ وجميع مهامه ستتم حذفها من الخادم، من كل جهاز آخر سُجِّل دخوله لهذا الحساب. هذا لا يمكن التراجع عنه.</string>
|
|
||||||
<plurals name="home_today_progress_count">
|
|
||||||
<item quantity="zero">تم %1$d من %2$d</item>
|
|
||||||
<item quantity="one">تم %1$d من %2$d</item>
|
|
||||||
<item quantity="two">تم %1$d من %2$d</item>
|
|
||||||
<item quantity="few">تم %1$d من %2$d</item>
|
|
||||||
<item quantity="many">تم %1$d من %2$d</item>
|
|
||||||
<item quantity="other">تم %1$d من %2$d</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="home_today_remaining_count">
|
|
||||||
<item quantity="zero">تبقي %1$d</item>
|
|
||||||
<item quantity="one">تبقي %1$d</item>
|
|
||||||
<item quantity="two">تبقي %1$d</item>
|
|
||||||
<item quantity="few">تبقي %1$d</item>
|
|
||||||
<item quantity="many">تبقي %1$d</item>
|
|
||||||
<item quantity="other">تبقي %1$d</item>
|
|
||||||
</plurals>
|
|
||||||
<string name="list_where_device">على هذا الجهاز فقط</string>
|
|
||||||
<string name="list_read_only">تتم مشاركة هذه القائمة معك للقراءة فقط، لذلك فإن اسمها ولونها للمالك للتغيير.</string>
|
|
||||||
<string name="onboarding_no_provider_title">مُحتاج تطبيق مهام</string>
|
|
||||||
<string name="onboarding_permission_title">السماح بالوصول إلى مهامك</string>
|
|
||||||
<string name="onboarding_permission_body">Agendula يحتاج إذن لقراءة و كتابة مهامك. هذا هو الشيء الوحيد الذي يطلب له دائمًا.</string>
|
|
||||||
<string name="onboarding_permission_button">منح الوصول إلى المهام</string>
|
|
||||||
<string name="onboarding_welcome_sync_body">المزامنة عبر CalDAV مع الخادم أنت تختاره، أو الاحتفاظ بكل شيء على هذا الجهاز.</string>
|
|
||||||
<string name="onboarding_welcome_offline_title">لا إنترنت، بالتصميم</string>
|
|
||||||
<string name="onboarding_welcome_offline_body">هذا الإصدار من Agendula ليس لديه الوصول إلى الشبكة، لذلك فإنه لا يمكنه المزامنة أو الاتصال لأي شيء نفسه.</string>
|
|
||||||
<string name="onboarding_sync_title">مزامنة مع خادمك الخاص؟</string>
|
|
||||||
<string name="onboarding_sync_body">Agendula يدعم CalDAV — Nextcloud, Radicale, Posteo, Fastmail و أي شيء آخر يدعمه. لا حساب من خاصّتنا، أبدًا.</string>
|
|
||||||
<plurals name="widget_today_progress_cd">
|
|
||||||
<item quantity="zero">تم %1$d من %2$d</item>
|
|
||||||
<item quantity="one">تم %1$d من %2$d</item>
|
|
||||||
<item quantity="two">تم %1$d من %2$d</item>
|
|
||||||
<item quantity="few">تم %1$d من %2$d</item>
|
|
||||||
<item quantity="many">تم %1$d من %2$d</item>
|
|
||||||
<item quantity="other">تم %1$d من %2$d</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="sync_notice_more">
|
|
||||||
<item quantity="zero">و (%1$d) لا أخرى</item>
|
|
||||||
<item quantity="one">و %1$d آخر</item>
|
|
||||||
<item quantity="two">و %1$d آخران</item>
|
|
||||||
<item quantity="few">و %1$d أخرى</item>
|
|
||||||
<item quantity="many">و %1$d آخر</item>
|
|
||||||
<item quantity="other">و %1$d آخر</item>
|
|
||||||
</plurals>
|
|
||||||
<string name="onboarding_no_provider_body">أنت اخترت للاحتفاظ بالمهام في تطبيق آخر، لكن لا واحد متوافق مثبّت. قم بتثبيت OpenTasks أو tasks.org، أو قم بالتبديل عودتًا إلى التخزين خاصّة Agendula.</string>
|
|
||||||
<string name="onboarding_sync_connect">ربط حساب</string>
|
|
||||||
<string name="onboarding_sync_devices_title">كل جهاز في وقت واحد</string>
|
|
||||||
<string name="onboarding_sync_devices_body">ضع علامة صح لشيء ما هنا و سيتم وضع العلامة عليه في كل مكان.</string>
|
|
||||||
<string name="onboarding_sync_copy_title">نسخة تبقَى بعد الهاتف</string>
|
|
||||||
<string name="onboarding_sync_copy_body">تعيش مهامك على الخادم أيضًا، لذلك جهاز مفقود لا يعني فقدان العمل.</string>
|
|
||||||
<string name="onboarding_sync_yours_title">لك الاختيار</string>
|
|
||||||
<string name="onboarding_sync_yours_body">مستضاف ذاتيًا (Self-hosted) أو مزود أنت تدفع له بالفعل — Agendula فقط يخزن كلمة المرور.</string>
|
|
||||||
<string name="onboarding_list_title">قائمتك الأولى</string>
|
|
||||||
<string name="onboarding_list_body">تحافظ القوائم على فصل الأشياء. ابدأ بواحدة — يمكنك إضافة المزيد، وإعادة تسمية هذه القائمة، أيًّا كان الوقت.</string>
|
|
||||||
<string name="onboarding_backup_title">احتفظ بنسخة</string>
|
|
||||||
<string name="settings_section_backup">النسخ الاحتياطي والاستعادة</string>
|
|
||||||
<string name="onboarding_backup_body_later">دون حساب، قوائمك تعيش فقط على هذا الجهاز. احفظهم كملفات iCalendar أي تطبيق مهام أو تقويم آخر يمكنه قراءتها، أيّا كان الوقت من الإعدادات ← النسخ الاحتياطي والاستعادة ← تصدير.</string>
|
|
||||||
<string name="onboarding_quick_add_title">كيف ترغب في إضافة المهام؟</string>
|
|
||||||
<string name="onboarding_quick_add_bar">شريط الإضافة السريع</string>
|
|
||||||
<string name="onboarding_quick_add_bar_hint">خانة في أسفل كل قائمة: اكتب، اضغط إدخال، إلى التالي.</string>
|
|
||||||
<string name="onboarding_quick_add_button">زر مهمة جديدة</string>
|
|
||||||
<string name="onboarding_quick_add_button_hint">زر عائم يفتح النموذج الكامل.</string>
|
|
||||||
<string name="onboarding_exact_alarms_title">صحيح على الوقت</string>
|
|
||||||
<string name="onboarding_exact_alarms_body">أندوريد يسأل قبل أن يتمكن تطبيق من إعلامك في دقيقة محددة. اسمح به والتذكيرات تصل في موعد الاستحقاق خاصّتهم — بدونه قد يتأخروا بضع دقائق.</string>
|
|
||||||
<string name="onboarding_exact_alarms_allow">السماح بالتوقيت الدقيق</string>
|
|
||||||
<string name="onboarding_use_own_store">استخدم تخزين هذا الجهاز بدلاً من ذلك</string>
|
|
||||||
<string name="widget_config_theme_follow_app">اتبع التطبيق</string>
|
|
||||||
<string name="widget_config_theme_light">فاتح</string>
|
|
||||||
<string name="widget_config_theme_dark">داكن</string>
|
|
||||||
<string name="widget_config_row_color">ألوان خام</string>
|
|
||||||
<string name="widget_config_row_color_neutral">محايد</string>
|
|
||||||
<string name="widget_config_background">الخلفية</string>
|
|
||||||
<string name="widget_config_background_solid">سادة</string>
|
|
||||||
<string name="widget_config_theme">السمة</string>
|
|
||||||
<string name="app_name_tasks_alias">مهام</string>
|
|
||||||
<string name="list_where">أين</string>
|
|
||||||
<string name="settings_backup_subtitle">التصدير و الاستيراد</string>
|
|
||||||
<string name="error_reminder_without_date">اضبط تاريخ بدء أو استحقاق لاستخدام تذكير.</string>
|
|
||||||
<string name="reminder_at_start">في وقت البدء</string>
|
|
||||||
<string name="reminder_at_due_time">في وقت الاستحقاق</string>
|
|
||||||
<string name="reminder_on_start_date">عند موعد البدء</string>
|
|
||||||
<string name="reminder_on_due_date">عند موعد الاستحقاق</string>
|
|
||||||
<string name="reminder_at_time">%1$s عند %2$s</string>
|
|
||||||
<string name="reminder_anchor_start">من البدء</string>
|
|
||||||
<string name="reminder_anchor_due">من تاريخ الاستحقاق</string>
|
|
||||||
<string name="reminder_time">الوقت</string>
|
|
||||||
<string name="reminder_benefit_delivery_title">تنبيه عندما يكون الأمر مهمًا</string>
|
|
||||||
<string name="reminder_benefit_reversible_title">يمكنك تغييره في أي وقت</string>
|
|
||||||
<string name="settings_app_name_hint">اعرض Agendula كـ ”مهام“ في مشغّل التطبيقات الخاص بك. فقط الاسم في المشغّل يتغير؛ وقد ينتقل الرمز إلى مكان جديد. يُغلَق Agendula عندما تقوم بالتبديل، لذا أعِد فتحه من المشغّل.</string>
|
|
||||||
<string name="settings_allday_reminder_time_summary">العد التنازلي لمهام التي تستمر طوال اليوم عند %1$s</string>
|
|
||||||
<string name="settings_store_permission_denied_hint">مهام التطبيق الآخر تبقى غير قابلة للوصول حتى تسمح بالوصول. اضغط لفتح إعدادات التطبيق.</string>
|
|
||||||
<string name="settings_copy_counting">جارٍ حساب ما هناك لنسخه…</string>
|
|
||||||
<string name="settings_copy_confirm_empty">%1$s لا يحتوي على مهام لنسخها.</string>
|
|
||||||
<string name="settings_copy_nothing">لم يكن هناك شيء للنسخ</string>
|
|
||||||
<string name="export_hint">ملف .ics واحد لكل قائمة، قابل للقراءة بواسطة تطبيقات المهام والتقويم الأخرى. القوائم الموضوع عليها بعلامة صح تذهب إلى مجلد تختاره أنت، أو إلى ملف مضغوط (zip) واحد.</string>
|
|
||||||
<string name="export_no_lists">لا توجد قوائم للتصدير</string>
|
|
||||||
<string name="export_to_folder">الحفظ إلى مجلد</string>
|
|
||||||
<string name="export_to_zip">حفظ كملف مضغوط (zip)</string>
|
|
||||||
<plurals name="export_done">
|
|
||||||
<item quantity="zero">تم تصدير (%1$d) لا قوائم</item>
|
|
||||||
<item quantity="one">تم تصدير قائمة واحدة (%1$d)</item>
|
|
||||||
<item quantity="two">تم تصدير قائمتان (%1$d)</item>
|
|
||||||
<item quantity="few">تم تصدير %1$d قوائم</item>
|
|
||||||
<item quantity="many">تم تصدير %1$d قائمة</item>
|
|
||||||
<item quantity="other">تم تصدير %1$d قائمة</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="reminder_minutes_before_start">
|
|
||||||
<item quantity="zero">(%1$d) لا دقائق قبل البدء</item>
|
|
||||||
<item quantity="one">%1$d دقيقة واحده قبل البدء</item>
|
|
||||||
<item quantity="two">%1$d دقيقتان قبل البدء</item>
|
|
||||||
<item quantity="few">%1$d دقائق قبل البدء</item>
|
|
||||||
<item quantity="many">%1$d دقيقة قبل البدء</item>
|
|
||||||
<item quantity="other">%1$d دقيقة قبل البدء</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="reminder_hours_before_start">
|
|
||||||
<item quantity="zero">(%1$d) لا ساعات قبل البدء</item>
|
|
||||||
<item quantity="one">%1$d ساعة واحده قبل البدء</item>
|
|
||||||
<item quantity="two">%1$d ساعتان قبل البدء</item>
|
|
||||||
<item quantity="few">%1$d ساعات قبل البدء</item>
|
|
||||||
<item quantity="many">%1$d ساعة قبل البدء</item>
|
|
||||||
<item quantity="other">%1$d ساعة قبل البدء</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="reminder_days_before_start">
|
|
||||||
<item quantity="zero">(%1$d) لا أيام قبل البدء</item>
|
|
||||||
<item quantity="one">%1$d يوم واحد قبل البدء</item>
|
|
||||||
<item quantity="two">%1$d يومان قبل البدء</item>
|
|
||||||
<item quantity="few">%1$d أيام قبل البدء</item>
|
|
||||||
<item quantity="many">%1$d يوم قبل البدء</item>
|
|
||||||
<item quantity="other">%1$d يوم قبل البدء</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="reminder_weeks_before_start">
|
|
||||||
<item quantity="zero">(%1$d) لا أسابيع قبل البدء</item>
|
|
||||||
<item quantity="one">%1$d أسبوع واحد قبل البدء</item>
|
|
||||||
<item quantity="two">%1$d أسبوعان قبل البدء</item>
|
|
||||||
<item quantity="few">%1$d أسابيع قبل البدء</item>
|
|
||||||
<item quantity="many">%1$d أسبوع قبل البدء</item>
|
|
||||||
<item quantity="other">%1$d أسبوع قبل البدء</item>
|
|
||||||
</plurals>
|
|
||||||
<string name="settings_accounts_subtitle">مزامنة مهامك مع خادم CalDAV</string>
|
|
||||||
<string name="accounts_add">إضافة حسابًا</string>
|
|
||||||
<string name="accounts_sync_interval">المزامنة تلقائيًا</string>
|
|
||||||
<string name="accounts_sync_interval_manual">فقط عند تقوم بالمزامنة</string>
|
|
||||||
<string name="accounts_push_via">تصل التغييرات فورًا، عبر %1$s</string>
|
|
||||||
<string name="widget_unavailable">افتح Agendula لإنهاء الإعداد</string>
|
|
||||||
<string name="widget_today_all_done">انتهى كل شيء</string>
|
|
||||||
<string name="widget_config_title">إظهار في الأداة المصغرة</string>
|
|
||||||
<string name="widget_config_group_by_list">تجميع حسب القائمة</string>
|
|
||||||
<string name="widget_config_group_by_list_hint">إظهار مهام كل قائمة ضمن عنوانها الخاص</string>
|
|
||||||
<string name="widget_config_background_solid_hint">يملأ الأداة المصغّرة بلون سطح السمة</string>
|
|
||||||
<string name="widget_config_background_tinted_hint">أكثر نعومة، تعبئة لونية متناغمة</string>
|
|
||||||
<string name="widget_config_background_transparent">شفافة</string>
|
|
||||||
<string name="widget_config_background_transparent_hint">لا تعبئة — تبقى المهام قابلة للقراءة في حاوياتها الخاصة</string>
|
|
||||||
<string name="widget_config_row_color_neutral_hint">يستخدم كل صف نفس التعبئة اللونية المتناغمة</string>
|
|
||||||
<string name="widget_config_row_color_by_list">حسب القائمة</string>
|
|
||||||
<string name="widget_config_row_color_by_list_hint">كل صف متناغم باللون الخاص بقائمته</string>
|
|
||||||
<string name="widget_today_description">حلقة تقدم لمهام اليوم</string>
|
|
||||||
<string name="widget_up_next_description">مهمتك الوحيدة الأقرب لموعد الاستحقاق</string>
|
|
||||||
<string name="widget_lists_label">قوائم</string>
|
|
||||||
<string name="widget_lists_description">مربع اختصار لكل قائمة، مع عدد مرّات فتحه</string>
|
|
||||||
<string name="widget_week_label">أسبوع</string>
|
|
||||||
<string name="widget_week_description">شريط من سبعة أيام لعدد المهام</string>
|
|
||||||
<string name="widget_config_background_tinted">ملونة</string>
|
|
||||||
<string name="settings_theme_black">أسود</string>
|
|
||||||
<string name="settings_theme_black_summary">داكن مع خلفيات سوداء نقية، لشاشات AMOLED</string>
|
|
||||||
<string name="settings_app_name">اسم التطبيق</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -68,7 +68,7 @@
|
|||||||
<string name="settings_translate_hint">Přidejte nový jazyk nebo vylepšete překlad na Weblate</string>
|
<string name="settings_translate_hint">Přidejte nový jazyk nebo vylepšete překlad na Weblate</string>
|
||||||
<string name="settings_translate">Pomozte s překladem</string>
|
<string name="settings_translate">Pomozte s překladem</string>
|
||||||
<string name="onboarding_no_provider_body">Rozhodli jste se ukládat úkoly v jiné aplikaci, ale nemáte nainstalovanou žádnou kompatibilní aplikaci. Nainstalujte OpenTasks nebo tasks.org, případně přepněte zpět na vlastní úložiště aplikace Agendula.</string>
|
<string name="onboarding_no_provider_body">Rozhodli jste se ukládat úkoly v jiné aplikaci, ale nemáte nainstalovanou žádnou kompatibilní aplikaci. Nainstalujte OpenTasks nebo tasks.org, případně přepněte zpět na vlastní úložiště aplikace Agendula.</string>
|
||||||
<string name="onboarding_backup_body_later">Pokud nemáte účet, vaše seznamy jsou uložené pouze v tomto zařízení. Kdykoli je můžete uložit jako soubory iCalendar, které lze otevřít v jiných aplikacích pro úkoly nebo kalendář. Stačí přejít do Nastavení → Zálohování a obnovení → Export.</string>
|
<string name="onboarding_backup_body_later">Pokud nemáte účet, vaše seznamy jsou uložené pouze v tomto zařízení. Kdykoli je můžete exportovat jako soubory iCalendar, které lze otevřít v jiných aplikacích pro úkoly nebo kalendář. Stačí přejít do Nastavení → Úložiště → Exportovat úkoly.</string>
|
||||||
<string name="onboarding_use_own_store">Používat úložiště tohoto zařízení</string>
|
<string name="onboarding_use_own_store">Používat úložiště tohoto zařízení</string>
|
||||||
<string name="settings_section_storage">Úložiště</string>
|
<string name="settings_section_storage">Úložiště</string>
|
||||||
<string name="settings_storage_subtitle">Kde jsou úkoly uložené a jak je exportovat</string>
|
<string name="settings_storage_subtitle">Kde jsou úkoly uložené a jak je exportovat</string>
|
||||||
@@ -76,9 +76,9 @@
|
|||||||
<string name="export_to_folder">Uložit do adresáře</string>
|
<string name="export_to_folder">Uložit do adresáře</string>
|
||||||
<string name="export_to_zip">Uložit jako ZIP soubor</string>
|
<string name="export_to_zip">Uložit jako ZIP soubor</string>
|
||||||
<string name="settings_export">Exportovat úkoly</string>
|
<string name="settings_export">Exportovat úkoly</string>
|
||||||
<string name="settings_about_support">Podpořit vývoj</string>
|
<string name="settings_about_support">Podpora vývoje</string>
|
||||||
<string name="settings_section_appearance">Vzhled</string>
|
<string name="settings_section_appearance">Vzhled</string>
|
||||||
<string name="settings_appearance_subtitle">Motiv, barvy, formát času</string>
|
<string name="settings_appearance_subtitle">Motiv, barva a formát času</string>
|
||||||
<string name="settings_theme">Motiv</string>
|
<string name="settings_theme">Motiv</string>
|
||||||
<string name="settings_theme_system">Dle systému</string>
|
<string name="settings_theme_system">Dle systému</string>
|
||||||
<string name="settings_theme_light">Světlý</string>
|
<string name="settings_theme_light">Světlý</string>
|
||||||
@@ -94,7 +94,7 @@
|
|||||||
<string name="settings_time_format_auto">Automaticky</string>
|
<string name="settings_time_format_auto">Automaticky</string>
|
||||||
<string name="settings_time_format_auto_summary">Podle systému: %1$s</string>
|
<string name="settings_time_format_auto_summary">Podle systému: %1$s</string>
|
||||||
<string name="settings_time_format_12h">12hodinový (2:00 PM)</string>
|
<string name="settings_time_format_12h">12hodinový (2:00 PM)</string>
|
||||||
<string name="settings_time_format_24h">24hodinový (14:00)</string>
|
<string name="settings_time_format_24h">24hodinový formát (14:00)</string>
|
||||||
<string name="settings_week_start">Víkend začíná v</string>
|
<string name="settings_week_start">Víkend začíná v</string>
|
||||||
<string name="settings_week_start_auto">Automaticky</string>
|
<string name="settings_week_start_auto">Automaticky</string>
|
||||||
<string name="settings_group_look">Vzhled a chování</string>
|
<string name="settings_group_look">Vzhled a chování</string>
|
||||||
@@ -115,223 +115,4 @@
|
|||||||
<string name="list_color">Barva</string>
|
<string name="list_color">Barva</string>
|
||||||
<string name="widget_config_row_color">Barva řádků</string>
|
<string name="widget_config_row_color">Barva řádků</string>
|
||||||
<string name="widget_config_row_color_by_list_hint">Každý řádek je lehce zabarven barvou svého seznamu</string>
|
<string name="widget_config_row_color_by_list_hint">Každý řádek je lehce zabarven barvou svého seznamu</string>
|
||||||
<string name="settings_section_task_form">Formulář úkolu</string>
|
|
||||||
<string name="settings_task_form_subtitle">Výchozí pole, seznam a podúkoly</string>
|
|
||||||
<string name="recurrence_title">Opakování</string>
|
|
||||||
<string name="home_today_all_done">Vše hotovo 🎉</string>
|
|
||||||
<string name="edit_start_label">Začátek</string>
|
|
||||||
<string name="detail_due">Termín splnění</string>
|
|
||||||
<string name="edit_due_label">Termín splnění</string>
|
|
||||||
<string name="error_due_before_start">Termín splnění nemůže předcházet začátku.</string>
|
|
||||||
<string name="error_recurrence_without_date">Opakující se úkol vyžaduje datum začátku nebo termín splnění.</string>
|
|
||||||
<string name="filter_section_due">Termín splnění</string>
|
|
||||||
<string name="filter_any_due">Jakýkoli termín splnění</string>
|
|
||||||
<string name="home_due_today">Dnes</string>
|
|
||||||
<string name="home_due_tomorrow">Zítra</string>
|
|
||||||
<string name="reminder_onboarding_body">Agendula vás upozorní, když nastane čas něco splnit, takže si nemusíte všechno pamatovat.</string>
|
|
||||||
<string name="onboarding_exact_alarms_body">Android se předem zeptá, zda aplikaci povolíte posílat upozornění v přesně stanovený čas. Pokud to povolíte, připomínky dorazí včas. Bez tohoto oprávnění se mohou o několik minut opozdit.</string>
|
|
||||||
<string name="settings_week_start_auto_summary">Aktuálně %1$s</string>
|
|
||||||
<string name="settings_group_about">O aplikaci</string>
|
|
||||||
<string name="settings_about_author">od Jean-Luc Makiola</string>
|
|
||||||
<string name="settings_about_version">Verze %1$s</string>
|
|
||||||
<string name="settings_about_logo_desc">Ikona aplikace Agendula</string>
|
|
||||||
<string name="settings_group_app">Aplikace</string>
|
|
||||||
<string name="settings_section_backup">Zálohování a obnovení</string>
|
|
||||||
<string name="settings_backup_subtitle">Export a import</string>
|
|
||||||
<string name="import_title">Importovat úkoly</string>
|
|
||||||
<plurals name="import_found">
|
|
||||||
<item quantity="one">%1$d úkol</item>
|
|
||||||
<item quantity="few">%1$d úkolů</item>
|
|
||||||
<item quantity="many">%1$d úkolů</item>
|
|
||||||
<item quantity="other">%1$d úkolů</item>
|
|
||||||
</plurals>
|
|
||||||
<string name="settings_export_hint">Uložit seznamy jako soubory iCalendar</string>
|
|
||||||
<string name="settings_import_hint">Importovat úkoly ze souboru iCalendar</string>
|
|
||||||
<string name="import_pick">Vybrat soubor</string>
|
|
||||||
<string name="import_pick_other">Vybrat jiný soubor</string>
|
|
||||||
<string name="import_hint">Vyberte soubor .ics nebo archiv ZIP obsahující více takových souborů, jaký vytváří export. Zachovají se opakování, podúkoly i všechny ostatní údaje úkolů. Úkoly, které už ve vybraném seznamu jsou, budou přeskočeny.</string>
|
|
||||||
<string name="import_pick_another">Importovat jiný soubor</string>
|
|
||||||
<string name="add_account_provider_body">Vyberte službu, ve které máte uložené seznamy úkolů. Agendula se synchronizuje se všemi službami podporujícími protokol CalDAV.</string>
|
|
||||||
<string name="add_account_lists_body">Vyberte seznamy úkolů, které chcete synchronizovat. Toto nastavení můžete později změnit.</string>
|
|
||||||
<string name="settings_copy_from_external">Kopírovat úkoly z %1$s</string>
|
|
||||||
<string name="onboarding_welcome_sync_body">Úkoly můžete synchronizovat přes CalDAV s vlastním serverem, nebo je uchovávat pouze v tomto zařízení.</string>
|
|
||||||
<string name="settings_store_own">Na tomto zařízení</string>
|
|
||||||
<string name="import_new_list_hint">Nový seznam na tomto zařizení</string>
|
|
||||||
<string name="settings_task_store_hint">Každé úložiště uchovává vlastní úkoly. Přepnutím mezi úložišti se úkoly nepřesunou. Nejprve je zkopírujte do druhého úložiště nebo je exportujte v sekci Zálohování a obnovení.</string>
|
|
||||||
<string name="settings_store_permission_denied_hint">K úkolům v jiné aplikaci nebude možné přistupovat, dokud nepovolíte přístup. Klepnutím otevřete nastavení aplikace.</string>
|
|
||||||
<string name="settings_section_accounts">Účty</string>
|
|
||||||
<string name="accounts_sync_interval">Synchronizovat automaticky</string>
|
|
||||||
<string name="accounts_sync_interval_hint">Jak často se jednotlivé účty synchronizují na pozadí. Změny, které provedete, se v každém případě odešlou do jedné minuty. Android může interval prodloužit, aby šetřil baterii.</string>
|
|
||||||
<string name="reminder_unit_minutes">Minuty</string>
|
|
||||||
<plurals name="duration_minutes">
|
|
||||||
<item quantity="one">%d minuta</item>
|
|
||||||
<item quantity="few">%d minut</item>
|
|
||||||
<item quantity="many">%d minut</item>
|
|
||||||
<item quantity="other">%d minut</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="accounts_sync_every_minutes">
|
|
||||||
<item quantity="one">Každou %d minutu</item>
|
|
||||||
<item quantity="few">Každé %d minuty</item>
|
|
||||||
<item quantity="many">Každých %d minut</item>
|
|
||||||
<item quantity="other">Každých %d minut</item>
|
|
||||||
</plurals>
|
|
||||||
<string name="add_account_browser_error_rate_limited">Server dočasně odmítá další pokusy. Počkejte několik minut a zkuste to znovu.</string>
|
|
||||||
<plurals name="duration_hours">
|
|
||||||
<item quantity="one">%d hodina</item>
|
|
||||||
<item quantity="few">%d hodin</item>
|
|
||||||
<item quantity="many">%d hodin</item>
|
|
||||||
<item quantity="other">%d hodin</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="reminder_hours">
|
|
||||||
<item quantity="one">Před %1$d hodinou</item>
|
|
||||||
<item quantity="few">Před %1$d hodinami</item>
|
|
||||||
<item quantity="many">Před %1$d hodinami</item>
|
|
||||||
<item quantity="other">Před %1$d hodinami</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="reminder_hours_before_start">
|
|
||||||
<item quantity="one">%1$d hodina před začátkem</item>
|
|
||||||
<item quantity="few">%1$d hodiny před začátkem</item>
|
|
||||||
<item quantity="many">%1$d hodin před začátkem</item>
|
|
||||||
<item quantity="other">%1$d hodin před začátkem</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="accounts_sync_every_hours">
|
|
||||||
<item quantity="one">Každou hodinu</item>
|
|
||||||
<item quantity="few">Každé %d hodiny</item>
|
|
||||||
<item quantity="many">Každých %d hodin</item>
|
|
||||||
<item quantity="other">Každých %d hodin</item>
|
|
||||||
</plurals>
|
|
||||||
<string name="accounts_sync_interval_manual">Jen při synchronizaci</string>
|
|
||||||
<string name="accounts_push">Okamžité doručování</string>
|
|
||||||
<string name="accounts_push_off">Vypnuto</string>
|
|
||||||
<string name="accounts_push_unsupported">Váš server zatím nepodporuje okamžité doručování</string>
|
|
||||||
<string name="accounts_push_no_distributor">Nainstalujte si aplikaci podporující UnifiedPush, abyste dostávali změny okamžitě</string>
|
|
||||||
<string name="accounts_push_hint">Pokud máte nainstalovanou aplikaci podporující UnifiedPush, například ntfy, změny provedené na ostatních zařízeních se projeví během několika sekund, místo aby se zobrazily až při další synchronizaci. Váš server musí podporovat WebDAV-Push. V případě Nextcloudu tuto funkci zajišťuje aplikace WebDAV Push.</string>
|
|
||||||
<string name="accounts_push_none_installed">Nemáte nainstalovanou žádnou aplikaci podporující UnifiedPush. Nainstalujte si například ntfy, NextPush nebo Sunup a její nabídka se zobrazí zde.</string>
|
|
||||||
<string name="onboarding_sync_body">Agendula komunikuje přes CalDAV – podporuje Nextcloud, Radicale, Posteo, Fastmail i jakoukoli jinou službu, která tento protokol používá. U nás si nikdy nemusíte zakládat účet.</string>
|
|
||||||
<string name="onboarding_sync_connect">Připojit účet</string>
|
|
||||||
<string name="accounts_empty_body">Přidejte účet CalDAV a Agendula bude synchronizovat vaše seznamy úkolů s tímto účtem. Podporuje Nextcloud, Radicale, Baïkal i jakoukoli jinou službu, která používá tento protokol.</string>
|
|
||||||
<string name="accounts_add">Přidat účet</string>
|
|
||||||
<string name="accounts_failed_misconfigured">Synchronizace selhala – účet není kompletní. Odeberte ho a přidejte znovu</string>
|
|
||||||
<string name="add_account_summary_body">Agendula bude odteď tyto seznamy synchronizovat. Které seznamy se synchronizují, můžete změnit v Nastavení.</string>
|
|
||||||
<string name="add_account_server_body">Zadejte adresu svého serveru CalDAV. Pokud server používá jako svou adresu vlastní doménu, můžete zadat také e-mailovou adresu.</string>
|
|
||||||
<string name="add_account_credentials_body">Pokud váš poskytovatel tuto možnost nabízí, použijte heslo pro aplikaci. Lze ho kdykoli zrušit, aniž byste museli měnit heslo ke svému účtu.</string>
|
|
||||||
<string name="add_account_error_not_dav">Zadaná adresa odpověděla, ale nejedná se o server CalDAV. Pokud jste vložili adresu webové stránky, zkuste použít adresu serveru, kterou váš poskytovatel uvádí pro kalendáře.</string>
|
|
||||||
<string name="add_account_error_unreachable">K serveru se nepodařilo připojit. Zkontrolujte adresu a připojení k internetu.</string>
|
|
||||||
<string name="add_account_error_server">Na straně serveru došlo k chybě. Zkuste to za chvíli znovu.</string>
|
|
||||||
<string name="add_account_error_google_unsupported">Kalendář Google nepodporuje synchronizaci úkolů přes CalDAV, jak uvádí i jeho vlastní dokumentace. Agendula s ním proto nemůže synchronizovat úkoly.</string>
|
|
||||||
<string name="add_account_error_cross_domain">Tento server uchovává některé seznamy úkolů na adrese %1$s, ke kterým se Agendula zatím nedokáže přihlásit.</string>
|
|
||||||
<string name="add_account_error_no_usable_lists">Přihlášení proběhlo úspěšně, ale tento účet neobsahuje žádné seznamy úkolů, které může Agendula používat.</string>
|
|
||||||
<string name="add_account_browser_error_expired">Časový limit pro schválení vypršel dříve, než server odpověděl.</string>
|
|
||||||
<string name="add_account_browser_error_maintenance">Server je v režimu údržby. Zkuste to znovu, až bude údržba dokončena.</string>
|
|
||||||
<string name="add_account_browser_error_unavailable">V tomto zařízení není prohlížeč, který by dokázal otevřít přihlašovací stránku. Použijte místo toho heslo.</string>
|
|
||||||
<string name="add_account_quirk_hint_fastmail">Fastmail vyžaduje heslo pro aplikaci, nikoli heslo k vašemu účtu. Protokol CalDAV navíc není součástí tarifu Basic.</string>
|
|
||||||
<string name="add_account_quirk_hint_icloud">iCloud vyžaduje heslo pro konkrétní aplikaci. Vytvoříte ho na adrese appleid.apple.com, pokud máte zapnuté dvoufaktorové ověřování.</string>
|
|
||||||
<string name="add_account_setup_icloud_title">iCloud vyžaduje heslo pro konkrétní aplikaci</string>
|
|
||||||
<string name="add_account_setup_fastmail_title">Fastmail vyžaduje heslo pro aplikaci</string>
|
|
||||||
<string name="add_account_setup_fastmail_footnote">CalDAV není součástí tarifu Fastmail Basic.</string>
|
|
||||||
<string name="add_account_password_hint">Pokud váš server tuto možnost nabízí, použijte heslo pro aplikaci – můžete ho zrušit, aniž byste museli měnit heslo ke svému účtu.</string>
|
|
||||||
<string name="add_account_browser_body">Schvalte Agendulu v prohlížeči a pak se vraťte sem. Vaše heslo se této aplikaci nikdy neodesílá – server vytvoří samostatné heslo pro aplikaci, které můžete kdykoli zrušit.</string>
|
|
||||||
<string name="add_account_browser_insecure">Přihlašovací stránka není zabezpečená šifrováním (HTTP). Vše, co na ní zadáte, včetně hesla k účtu, se přenáší nešifrovaně.</string>
|
|
||||||
<string name="add_account_browser_host_mismatch">Server nás přesměroval na adresu %1$s, ale vy jste zadali adresu %2$s. To obvykle znamená, že nastavení `overwrite.cli.url` není správné.</string>
|
|
||||||
<string name="add_account_origin_mismatch">Server oznámil svou adresu jako %1$s, na kterou se toto zařízení nemůže připojit, proto byla použita adresa %2$s. Nastavení `overwrite.cli.url` nebo `trusted_proxies` serveru je pravděpodobně nesprávné.</string>
|
|
||||||
<string name="cd_expand_subtasks">Ukázat podúkoly</string>
|
|
||||||
<string name="cd_collapse_subtasks">Skrýt podúkoly</string>
|
|
||||||
<string name="detail_subtasks">Podúkoly</string>
|
|
||||||
<plurals name="detail_delete_body_subtasks">
|
|
||||||
<item quantity="one">Tento úkol a jeho podúkol budou smazány.</item>
|
|
||||||
<item quantity="few">Tento úkol a jeho %1$d podúkoly budou smazány.</item>
|
|
||||||
<item quantity="many">Tento úkol a jeho %1$d podúkolů budou smazány.</item>
|
|
||||||
<item quantity="other">Tento úkol a jeho %1$d podúkolů budou smazány.</item>
|
|
||||||
</plurals>
|
|
||||||
<string name="recurrence_none">Neopakovat</string>
|
|
||||||
<string name="edit_recurrence_label">Opakování</string>
|
|
||||||
<string name="edit_recurrence_none">Neopakovat</string>
|
|
||||||
<string name="reminder_custom">Vlastní</string>
|
|
||||||
<string name="reminder_custom_with_value">Vlastní (%1$s)</string>
|
|
||||||
<string name="recurrence_weekly">Každý týden</string>
|
|
||||||
<plurals name="recurrence_every_n_weeks">
|
|
||||||
<item quantity="one">Každý %1$d týden</item>
|
|
||||||
<item quantity="few">Každé %1$d týdny</item>
|
|
||||||
<item quantity="many">Každých %1$d týdnů</item>
|
|
||||||
<item quantity="other">Každých %1$d týdnů</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="reminder_weeks_before_start">
|
|
||||||
<item quantity="one">%1$d týden před začátkem</item>
|
|
||||||
<item quantity="few">%1$d týdny před začátkem</item>
|
|
||||||
<item quantity="many">%1$d týdnů před začátkem</item>
|
|
||||||
<item quantity="other">%1$d týdnů před začátkem</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="reminder_weeks_before_due">
|
|
||||||
<item quantity="one">%1$d týden před termínem splnění</item>
|
|
||||||
<item quantity="few">%1$d týdny před termínem splnění</item>
|
|
||||||
<item quantity="many">%1$d týdnů před termínem splnění</item>
|
|
||||||
<item quantity="other">%1$d týdnů před termínem splnění</item>
|
|
||||||
</plurals>
|
|
||||||
<string name="recurrence_incomplete">Zadejte číslo od 1 do 999</string>
|
|
||||||
<string name="recurrence_end_count">Po určitém počtu opakování</string>
|
|
||||||
<string name="recurrence_end_until">V konkrétní den</string>
|
|
||||||
<string name="error_reminder_without_date">Pro nastavení připomínky zadejte datum začátku nebo termín splnění.</string>
|
|
||||||
<string name="reminder_on_start_date">V den začátku</string>
|
|
||||||
<string name="reminder_on_due_date">V den termínu splnění</string>
|
|
||||||
<string name="reminder_anchor_due">Od termínu splnění</string>
|
|
||||||
<string name="filters_empty_hint">Kombinujte termíny splnění, seznamy, štítky a priority do vlastního přehledu</string>
|
|
||||||
<string name="settings_default_start_today_hint">Předvyplnit datum začátku nového úkolu dnešním datem</string>
|
|
||||||
<plurals name="reminder_minutes_before_due">
|
|
||||||
<item quantity="one">%1$d minutu před termínem splnění</item>
|
|
||||||
<item quantity="few">%1$d minut před termínem splnění</item>
|
|
||||||
<item quantity="many">%1$d minut před termínem splnění</item>
|
|
||||||
<item quantity="other">%1$d minut před termínem splnění</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="reminder_hours_before_due">
|
|
||||||
<item quantity="one">%1$d hodinu před termínem splnění</item>
|
|
||||||
<item quantity="few">%1$d hodin před termínem splnění</item>
|
|
||||||
<item quantity="many">%1$d hodin před termínem splnění</item>
|
|
||||||
<item quantity="other">%1$d hodin před termínem splnění</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="reminder_days_before_due">
|
|
||||||
<item quantity="one">%1$d den před termínem splnění</item>
|
|
||||||
<item quantity="few">%1$d dny před termínem splnění</item>
|
|
||||||
<item quantity="many">%1$d dní před termínem splnění</item>
|
|
||||||
<item quantity="other">%1$d dní před termínem splnění</item>
|
|
||||||
</plurals>
|
|
||||||
<string name="clear_completed_confirm">Smazat</string>
|
|
||||||
<string name="detail_delete_title">Smazat úkol?</string>
|
|
||||||
<string name="detail_delete_body">Tento úkol bude smazán.</string>
|
|
||||||
<string name="filter_delete_title">Smazat “%1$s”?</string>
|
|
||||||
<string name="list_delete_confirm_title">Smazat seznam?</string>
|
|
||||||
<string name="list_delete_confirm_message_synced">„%1$s“ a všechny jeho úkoly budou smazány ze serveru i ze všech ostatních zařízení přihlášených k tomuto účtu. Tuto akci nelze vrátit zpět.</string>
|
|
||||||
<string name="list_delete_confirm_message">„%1$s“ a všechny jeho úkoly budou smazány. Tuto akci nelze vrátit zpět.</string>
|
|
||||||
<string name="accounts_remove_body">%1$s se přestane synchronizovat s tímto zařízením. Na serveru se nic nesmaže.</string>
|
|
||||||
<string name="accounts_remove_wipe_body">Z tohoto zařízení se zároveň smažou všechny seznamy a úkoly patřící k tomuto účtu.</string>
|
|
||||||
<string name="accounts_lists_drop_body">U seznamů, u kterých jste zrušili zaškrtnutí, se zastaví synchronizace s tímto zařízením. Na serveru se nic nesmaže.</string>
|
|
||||||
<string name="accounts_lists_drop_wipe_body">Z tohoto zařízení se zároveň smažou vybrané seznamy i všechny jejich úkoly.</string>
|
|
||||||
<string name="sync_notice_cause_delete_lost">Tady jste ho smazali, ale na serveru byl mezitím změněn</string>
|
|
||||||
<string name="permission_write_tasks_description">Umožňuje aplikaci přidávat, upravovat, označovat jako dokončené a mazat úkoly uložené v Agendule, včetně jejich připomínek a štítků. Seznamy úkolů upravovat ani mazat nemůže.</string>
|
|
||||||
<string name="edit_set">Nastavit</string>
|
|
||||||
<string name="reminder_custom_set">Nastavit</string>
|
|
||||||
<string name="settings_list_reminders_hint">Přepíše výchozí nastavení pro každý seznam zvlášť, a to samostatně pro úkoly s konkrétním časem a celodenní úkoly. Seznam může převzít výchozí nastavení, nepoužívat žádné nebo mít vlastní nastavení.</string>
|
|
||||||
<string name="settings_list_notifications">Zvuk a vibrace</string>
|
|
||||||
<string name="settings_list_notifications_hint">Zvuk, vibrace a důležitost připomínek pro tento seznam</string>
|
|
||||||
<string name="detail_duplicate">Vytvořit kopii</string>
|
|
||||||
<string name="detail_status_cancelled">Zrušeno</string>
|
|
||||||
<string name="detail_cancel_task">Zrušit úkol</string>
|
|
||||||
<string name="detail_restore">Obnovit úkol</string>
|
|
||||||
<string name="edit_reminder_label">Upozornění</string>
|
|
||||||
<string name="reminder_at_due">V čase úkolu</string>
|
|
||||||
<string name="reminder_on_the_day">V daný den</string>
|
|
||||||
<string name="settings_list_reminders_title">Upozornění pro jednotlivé seznamy</string>
|
|
||||||
<string name="shortcut_new_task">Nový úkol</string>
|
|
||||||
<string name="shortcut_today">Dnes</string>
|
|
||||||
<string name="qs_tile_new_task">Nový úkol</string>
|
|
||||||
<string name="sort_title">Seřadit podle</string>
|
|
||||||
<string name="view_options_title">Řazení a filtrování</string>
|
|
||||||
<string name="view_filter_tags">Filtrovat podle štítku</string>
|
|
||||||
<string name="view_filter_clear">Zrušit filtr</string>
|
|
||||||
<string name="sort_due">Termín splnění</string>
|
|
||||||
<string name="sort_title_alpha">Název</string>
|
|
||||||
<string name="sort_created">Nedávno přidané</string>
|
|
||||||
<string name="clear_completed_action">Zrušit</string>
|
|
||||||
<string name="undo">Zpět</string>
|
|
||||||
<string name="section_today">Dnes</string>
|
|
||||||
<string name="section_upcoming">Nadcházející</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -442,19 +442,4 @@
|
|||||||
<string name="recurring_scope_series">Alle Termine der Serie</string>
|
<string name="recurring_scope_series">Alle Termine der Serie</string>
|
||||||
<string name="edit_recurrence_label">Wiederholung</string>
|
<string name="edit_recurrence_label">Wiederholung</string>
|
||||||
<string name="edit_recurrence_none">Wiederholt sich nicht</string>
|
<string name="edit_recurrence_none">Wiederholt sich nicht</string>
|
||||||
<string name="reminder_time">Zeit</string>
|
|
||||||
<string name="filters_header">Filter</string>
|
|
||||||
<string name="filter_new_title">Neuer Filter</string>
|
|
||||||
<string name="filter_edit_title">Filter bearbeiten</string>
|
|
||||||
<string name="filter_name_hint">Name des Filters</string>
|
|
||||||
<string name="filter_section_due">Fällig</string>
|
|
||||||
<string name="filter_section_priority">Priorität</string>
|
|
||||||
<string name="filter_section_lists">Listen</string>
|
|
||||||
<string name="filter_priority_low">Niedriger und höher</string>
|
|
||||||
<string name="filter_priority_medium">Mittel und höher</string>
|
|
||||||
<string name="filter_priority_high">Nur hoch</string>
|
|
||||||
<string name="filter_delete">Filter löschen</string>
|
|
||||||
<string name="filter_delete_title">“%1$s” löschen?</string>
|
|
||||||
<string name="filter_delete_confirm">Löschen</string>
|
|
||||||
<string name="filter_missing">Filter gelöscht</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<resources>
|
|
||||||
<!-- Nearest to the dynamic scheme's background, tone 6 of the neutral variant. -->
|
|
||||||
<color name="window_background">@android:color/system_neutral2_900</color>
|
|
||||||
</resources>
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
<resources>
|
|
||||||
<color name="window_background">@android:color/system_background_dark</color>
|
|
||||||
</resources>
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
<resources>
|
|
||||||
<bool name="light_system_bars">false</bool>
|
|
||||||
</resources>
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
<resources>
|
|
||||||
<color name="window_background_fallback">#FF161113</color>
|
|
||||||
</resources>
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<string name="app_name">Agendula</string>
|
|
||||||
<string name="task_untitled">Задача без имени</string>
|
|
||||||
<string name="back">Назад</string>
|
|
||||||
<string name="save">Сохранить</string>
|
|
||||||
<string name="delete">Удалить</string>
|
|
||||||
<string name="tasks_title">Задачи</string>
|
|
||||||
<string name="task_list_empty">Здесь пока нет задач.</string>
|
|
||||||
<string name="task_list_failure">Невозможно загрузить эти задачи.</string>
|
|
||||||
<string name="smart_no_date">Без даты</string>
|
|
||||||
<string name="smart_completed">Завершено</string>
|
|
||||||
<string name="task_detail_title">Задача</string>
|
|
||||||
<string name="task_detail_not_found">Задачи больше не существует.</string>
|
|
||||||
<string name="edit">Редактировать</string>
|
|
||||||
<string name="field_description">Описание</string>
|
|
||||||
<string name="edit_save_failed">Не удалось сохранить. Попробуйте снова.</string>
|
|
||||||
<string name="add_task_hint">Добавить задачу</string>
|
|
||||||
<string name="add_subtask_hint">Добавить подзадачу</string>
|
|
||||||
<string name="cd_add_task">Добавить задачу</string>
|
|
||||||
<string name="cd_complete">Завершить</string>
|
|
||||||
<string name="cd_reopen">Открыть заново</string>
|
|
||||||
<string name="task_deleted">Удалено</string>
|
|
||||||
<string name="task_completed">Завершено</string>
|
|
||||||
<string name="cd_repeats">Повторить</string>
|
|
||||||
<string name="shortcut_new_task">Новая задача</string>
|
|
||||||
<string name="shortcut_today">Сегодня</string>
|
|
||||||
<string name="qs_tile_new_task">Новая задача</string>
|
|
||||||
<string name="lists_reorder">Переопределить список</string>
|
|
||||||
<string name="lists_reorder_done">Завершить переопределение</string>
|
|
||||||
<string name="app_name_tasks_alias">Задачи</string>
|
|
||||||
<string name="lists_reorder_handle">Перетащите, чтобы изменить порядок</string>
|
|
||||||
<string name="sort_title">Сортировать по</string>
|
|
||||||
<string name="view_options_title">Сортировать и фильтровать</string>
|
|
||||||
<string name="view_filter_tags">Фильтр по тегу</string>
|
|
||||||
<string name="view_filter_clear">Очистить фильтр</string>
|
|
||||||
<string name="sort_due">Срок выполнения</string>
|
|
||||||
</resources>
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
</resources>
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<resources>
|
|
||||||
<!-- Nearest to the dynamic scheme's background, tone 98 of the neutral variant. -->
|
|
||||||
<color name="window_background">@android:color/system_neutral2_10</color>
|
|
||||||
</resources>
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
<resources>
|
|
||||||
<color name="window_background">@android:color/system_background_light</color>
|
|
||||||
</resources>
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
</resources>
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
<resources>
|
|
||||||
<bool name="light_system_bars">true</bool>
|
|
||||||
</resources>
|
|
||||||
@@ -2,8 +2,4 @@
|
|||||||
<!-- Seed color: warm mauve. Material 3 derives Light & Dark schemes from this. -->
|
<!-- Seed color: warm mauve. Material 3 derives Light & Dark schemes from this. -->
|
||||||
<!-- Adaptive icon background -->
|
<!-- Adaptive icon background -->
|
||||||
<color name="ic_launcher_background">#FF7A5C6B</color>
|
<color name="ic_launcher_background">#FF7A5C6B</color>
|
||||||
<!-- The Compose fallback schemes' background, kept equal by WindowColorsTest. -->
|
|
||||||
<color name="window_background_fallback">#FFFEFBFC</color>
|
|
||||||
<!-- The launch window and splash: the dynamic background where there is one. -->
|
|
||||||
<color name="window_background">@color/window_background_fallback</color>
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -127,16 +127,6 @@
|
|||||||
<string name="settings_list_notifications">Sound & vibration</string>
|
<string name="settings_list_notifications">Sound & vibration</string>
|
||||||
<string name="settings_list_notifications_hint">Sound, vibration and importance for this list’s reminders</string>
|
<string name="settings_list_notifications_hint">Sound, vibration and importance for this list’s reminders</string>
|
||||||
<string name="settings_list_reminder_inherits">Default (%1$s)</string>
|
<string name="settings_list_reminder_inherits">Default (%1$s)</string>
|
||||||
<string name="settings_list_reminder_own">Own default reminders</string>
|
|
||||||
<string name="settings_list_reminder_follows">Follows the default</string>
|
|
||||||
<plurals name="settings_list_reminders_own_count">
|
|
||||||
<item quantity="one">%1$d list has its own default reminders</item>
|
|
||||||
<item quantity="other">%1$d lists have their own default reminders</item>
|
|
||||||
</plurals>
|
|
||||||
<plurals name="settings_default_reminder_lists_own">
|
|
||||||
<item quantity="one">%1$d list uses its own</item>
|
|
||||||
<item quantity="other">%1$d lists use their own</item>
|
|
||||||
</plurals>
|
|
||||||
|
|
||||||
<!-- Recurrence: read-out and picker -->
|
<!-- Recurrence: read-out and picker -->
|
||||||
<string name="recurrence_title">Repeat</string>
|
<string name="recurrence_title">Repeat</string>
|
||||||
@@ -210,8 +200,6 @@
|
|||||||
<string name="edit_reminder_add">Add reminder</string>
|
<string name="edit_reminder_add">Add reminder</string>
|
||||||
<string name="edit_reminder_add_first">Add a reminder (otherwise the default applies)</string>
|
<string name="edit_reminder_add_first">Add a reminder (otherwise the default applies)</string>
|
||||||
<string name="edit_reminder_remove">Remove reminder</string>
|
<string name="edit_reminder_remove">Remove reminder</string>
|
||||||
<string name="edit_reminder_list_defaults">Default reminders from list %1$s</string>
|
|
||||||
<string name="edit_reminder_list_defaults_none">List %1$s sets no default reminder for this task</string>
|
|
||||||
<string name="reminder_at_start">At start time</string>
|
<string name="reminder_at_start">At start time</string>
|
||||||
<string name="reminder_at_due_time">At due time</string>
|
<string name="reminder_at_due_time">At due time</string>
|
||||||
<string name="reminder_on_start_date">On the start date</string>
|
<string name="reminder_on_start_date">On the start date</string>
|
||||||
@@ -484,13 +472,6 @@
|
|||||||
<string name="settings_snooze_duration">Snooze duration</string>
|
<string name="settings_snooze_duration">Snooze duration</string>
|
||||||
<string name="settings_reliable_delivery_hint">Android may delay reminders to save battery. Exempt Agendula so they arrive on time.</string>
|
<string name="settings_reliable_delivery_hint">Android may delay reminders to save battery. Exempt Agendula so they arrive on time.</string>
|
||||||
<string name="settings_reliable_delivery_exempt">Exempt from battery optimisation — reminders arrive on time.</string>
|
<string name="settings_reliable_delivery_exempt">Exempt from battery optimisation — reminders arrive on time.</string>
|
||||||
<string name="settings_reminder_description">Description in reminders</string>
|
|
||||||
<string name="settings_reminder_description_hidden">Hidden</string>
|
|
||||||
<string name="settings_reminder_description_short">Short</string>
|
|
||||||
<string name="settings_reminder_description_full">Full</string>
|
|
||||||
<string name="settings_reminder_description_hidden_summary">Only the title and due time</string>
|
|
||||||
<string name="settings_reminder_description_short_summary">A short preview of the description</string>
|
|
||||||
<string name="settings_reminder_description_full_summary">The whole description</string>
|
|
||||||
<string name="settings_default_list">Default list</string>
|
<string name="settings_default_list">Default list</string>
|
||||||
<string name="settings_default_list_first">First available list</string>
|
<string name="settings_default_list_first">First available list</string>
|
||||||
<string name="settings_add_subtask_row">Show \"add a subtask\" row</string>
|
<string name="settings_add_subtask_row">Show \"add a subtask\" row</string>
|
||||||
@@ -851,7 +832,6 @@
|
|||||||
<string name="add_account_certificate_issuer">Issued by</string>
|
<string name="add_account_certificate_issuer">Issued by</string>
|
||||||
<string name="add_account_certificate_expires">Valid until</string>
|
<string name="add_account_certificate_expires">Valid until</string>
|
||||||
<string name="add_account_certificate_trust">Trust this certificate</string>
|
<string name="add_account_certificate_trust">Trust this certificate</string>
|
||||||
<string name="add_account_certificate_decline">Don\u2019t trust it</string>
|
|
||||||
|
|
||||||
<string name="add_account_lists_title">Which lists should sync?</string>
|
<string name="add_account_lists_title">Which lists should sync?</string>
|
||||||
<string name="add_account_lists_read_only">Read-only</string>
|
<string name="add_account_lists_read_only">Read-only</string>
|
||||||
|
|||||||
@@ -1,19 +1,7 @@
|
|||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||||
<!-- The launch window and splash; Compose draws the rest. Its light or dark
|
<style name="Theme.Agendula" parent="android:Theme.Material.Light.NoActionBar">
|
||||||
follows the app's theme setting, handed to the system by SystemTheme. -->
|
|
||||||
<style name="Theme.Agendula" parent="Theme.AppCompat.DayNight.NoActionBar">
|
|
||||||
<item name="android:windowBackground">@color/window_background</item>
|
|
||||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||||
<item name="android:navigationBarColor">@android:color/transparent</item>
|
<item name="android:navigationBarColor">@android:color/transparent</item>
|
||||||
<item name="android:windowLightStatusBar">@bool/light_system_bars</item>
|
<item name="android:windowLightStatusBar">true</item>
|
||||||
</style>
|
|
||||||
|
|
||||||
<!-- Splash themes picked at runtime on API 33+, see SystemTheme. -->
|
|
||||||
<style name="Theme.Agendula.Fallback">
|
|
||||||
<item name="android:windowBackground">@color/window_background_fallback</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="Theme.Agendula.Black">
|
|
||||||
<item name="android:windowBackground">@android:color/black</item>
|
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -10,8 +10,4 @@
|
|||||||
<locale android:name="en" />
|
<locale android:name="en" />
|
||||||
<locale android:name="de" />
|
<locale android:name="de" />
|
||||||
<locale android:name="pt-BR" />
|
<locale android:name="pt-BR" />
|
||||||
<locale android:name="fr" />
|
|
||||||
<locale android:name="ar" />
|
|
||||||
<locale android:name="cs" />
|
|
||||||
<locale android:name="ru" />
|
|
||||||
</locale-config>
|
</locale-config>
|
||||||
Loaded 100 of 158 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user