mirror of https://github.com/tasks/tasks
Blocking daos delegate to suspending daos
Alex Baker
6 years ago
parent
122a2c2170
commit
f6dd3a63e6
@ -1,31 +1,31 @@
|
|||||||
package org.tasks.data
|
package org.tasks.data
|
||||||
|
|
||||||
import androidx.room.Dao
|
import kotlinx.coroutines.runBlocking
|
||||||
import androidx.room.Delete
|
import javax.inject.Inject
|
||||||
import androidx.room.Insert
|
|
||||||
import androidx.room.Query
|
|
||||||
|
|
||||||
@Dao
|
@Deprecated("use coroutines")
|
||||||
interface AlarmDaoBlocking {
|
class AlarmDaoBlocking @Inject constructor(private val dao: AlarmDao) {
|
||||||
@Query("SELECT alarms.* FROM alarms INNER JOIN tasks ON tasks._id = alarms.task "
|
fun getActiveAlarms(): List<Alarm> = runBlocking {
|
||||||
+ "WHERE tasks.completed = 0 AND tasks.deleted = 0 AND tasks.lastNotified < alarms.time "
|
dao.getActiveAlarms()
|
||||||
+ "ORDER BY time ASC")
|
}
|
||||||
fun getActiveAlarms(): List<Alarm>
|
|
||||||
|
|
||||||
@Query("SELECT alarms.* FROM alarms INNER JOIN tasks ON tasks._id = alarms.task "
|
fun getActiveAlarms(taskId: Long): List<Alarm> = runBlocking {
|
||||||
+ "WHERE tasks._id = :taskId AND tasks.completed = 0 AND tasks.deleted = 0 AND tasks.lastNotified < alarms.time "
|
dao.getActiveAlarms(taskId)
|
||||||
+ "ORDER BY time ASC")
|
}
|
||||||
fun getActiveAlarms(taskId: Long): List<Alarm>
|
|
||||||
|
|
||||||
@Query("SELECT * FROM alarms WHERE task = :taskId ORDER BY time ASC")
|
fun getAlarms(taskId: Long): List<Alarm> = runBlocking {
|
||||||
fun getAlarms(taskId: Long): List<Alarm>
|
dao.getAlarms(taskId)
|
||||||
|
}
|
||||||
|
|
||||||
@Delete
|
fun delete(alarm: Alarm) = runBlocking {
|
||||||
fun delete(alarm: Alarm)
|
dao.delete(alarm)
|
||||||
|
}
|
||||||
|
|
||||||
@Insert
|
fun insert(alarm: Alarm): Long = runBlocking {
|
||||||
fun insert(alarm: Alarm): Long
|
dao.insert(alarm)
|
||||||
|
}
|
||||||
|
|
||||||
@Insert
|
fun insert(alarms: Iterable<Alarm>) = runBlocking {
|
||||||
fun insert(alarms: Iterable<Alarm>)
|
dao.insert(alarms)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -1,47 +1,38 @@
|
|||||||
package org.tasks.data
|
package org.tasks.data
|
||||||
|
|
||||||
import android.database.Cursor
|
import android.database.Cursor
|
||||||
import androidx.room.Dao
|
|
||||||
import androidx.room.Query
|
|
||||||
import androidx.room.RawQuery
|
|
||||||
import androidx.sqlite.db.SupportSQLiteQuery
|
import androidx.sqlite.db.SupportSQLiteQuery
|
||||||
import com.todoroo.astrid.data.Task
|
import com.todoroo.astrid.data.Task
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
@Dao
|
import javax.inject.Inject
|
||||||
interface ContentProviderDaoBlocking {
|
|
||||||
@Query("SELECT name FROM tags WHERE task = :taskId ORDER BY UPPER(name) ASC")
|
@Deprecated("use coroutines")
|
||||||
fun getTagNames(taskId: Long): List<String>
|
class ContentProviderDaoBlocking @Inject constructor(private val dao: ContentProviderDao) {
|
||||||
|
fun getTagNames(taskId: Long): List<String> = runBlocking {
|
||||||
@Query("""
|
dao.getTagNames(taskId)
|
||||||
SELECT *
|
}
|
||||||
FROM tasks
|
|
||||||
WHERE completed = 0
|
fun getAstrid2TaskProviderTasks(): List<Task> = runBlocking {
|
||||||
AND deleted = 0
|
dao.getAstrid2TaskProviderTasks()
|
||||||
AND hideUntil < (strftime('%s', 'now') * 1000)
|
}
|
||||||
ORDER BY (CASE
|
|
||||||
WHEN (dueDate = 0) THEN
|
fun tagDataOrderedByName(): List<TagData> = runBlocking {
|
||||||
(strftime('%s', 'now') * 1000) * 2
|
dao.tagDataOrderedByName()
|
||||||
ELSE ((CASE WHEN (dueDate / 1000) % 60 > 0 THEN dueDate ELSE (dueDate + 43140000) END)) END) +
|
}
|
||||||
172800000 * importance
|
|
||||||
ASC
|
fun getTasks(): Cursor {
|
||||||
LIMIT 100""")
|
return dao.getTasks()
|
||||||
fun getAstrid2TaskProviderTasks(): List<Task>
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM tagdata WHERE name IS NOT NULL AND name != '' ORDER BY UPPER(name) ASC")
|
fun getLists(): Cursor {
|
||||||
fun tagDataOrderedByName(): List<TagData>
|
return dao.getLists()
|
||||||
|
}
|
||||||
@Query("SELECT * FROM tasks")
|
|
||||||
fun getTasks(): Cursor
|
fun getGoogleTaskLists(): Cursor {
|
||||||
|
return dao.getGoogleTaskLists()
|
||||||
@Query("""
|
}
|
||||||
SELECT caldav_lists.*, caldav_accounts.cda_name
|
|
||||||
FROM caldav_lists
|
fun rawQuery(query: SupportSQLiteQuery): Cursor {
|
||||||
INNER JOIN caldav_accounts ON cdl_account = cda_uuid""")
|
return dao.rawQuery(query)
|
||||||
fun getLists(): Cursor
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_task_lists")
|
|
||||||
fun getGoogleTaskLists(): Cursor
|
|
||||||
|
|
||||||
@RawQuery
|
|
||||||
fun rawQuery(query: SupportSQLiteQuery): Cursor
|
|
||||||
}
|
}
|
||||||
@ -1,114 +1,95 @@
|
|||||||
package org.tasks.data
|
package org.tasks.data
|
||||||
|
|
||||||
import androidx.room.Dao
|
import kotlinx.coroutines.runBlocking
|
||||||
import androidx.room.Delete
|
import javax.inject.Inject
|
||||||
import androidx.room.Query
|
|
||||||
import androidx.room.Transaction
|
|
||||||
import org.tasks.data.CaldavDao.Companion.LOCAL
|
|
||||||
import org.tasks.db.DbUtils.eachChunk
|
|
||||||
import java.util.*
|
|
||||||
|
|
||||||
@Dao
|
@Deprecated("use coroutines")
|
||||||
abstract class DeletionDaoBlocking {
|
class DeletionDaoBlocking @Inject constructor(private val dao: DeletionDao) {
|
||||||
@Query("DELETE FROM caldav_tasks WHERE cd_task IN(:ids)")
|
fun deleteCaldavTasks(ids: List<Long>) = runBlocking {
|
||||||
abstract fun deleteCaldavTasks(ids: List<Long>)
|
dao.deleteCaldavTasks(ids)
|
||||||
|
}
|
||||||
@Query("DELETE FROM google_tasks WHERE gt_task IN(:ids)")
|
|
||||||
abstract fun deleteGoogleTasks(ids: List<Long>)
|
|
||||||
|
|
||||||
@Query("DELETE FROM tags WHERE task IN(:ids)")
|
|
||||||
abstract fun deleteTags(ids: List<Long>)
|
|
||||||
|
|
||||||
@Query("DELETE FROM geofences WHERE task IN(:ids)")
|
|
||||||
abstract fun deleteGeofences(ids: List<Long>)
|
|
||||||
|
|
||||||
@Query("DELETE FROM alarms WHERE task IN(:ids)")
|
fun deleteGoogleTasks(ids: List<Long>) = runBlocking {
|
||||||
abstract fun deleteAlarms(ids: List<Long>)
|
dao.deleteGoogleTasks(ids)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("DELETE FROM tasks WHERE _id IN(:ids)")
|
fun deleteTags(ids: List<Long>) = runBlocking {
|
||||||
abstract fun deleteTasks(ids: List<Long>)
|
dao.deleteTags(ids)
|
||||||
|
}
|
||||||
|
|
||||||
@Transaction
|
fun deleteGeofences(ids: List<Long>) = runBlocking {
|
||||||
open fun delete(ids: List<Long>) {
|
dao.deleteGeofences(ids)
|
||||||
ids.eachChunk {
|
|
||||||
deleteAlarms(it)
|
|
||||||
deleteGeofences(it)
|
|
||||||
deleteTags(it)
|
|
||||||
deleteGoogleTasks(it)
|
|
||||||
deleteCaldavTasks(it)
|
|
||||||
deleteTasks(it)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun deleteAlarms(ids: List<Long>) = runBlocking {
|
||||||
|
dao.deleteAlarms(ids)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Query("UPDATE tasks "
|
fun deleteTasks(ids: List<Long>) = runBlocking {
|
||||||
+ "SET modified = (strftime('%s','now')*1000), deleted = (strftime('%s','now')*1000)"
|
dao.deleteTasks(ids)
|
||||||
+ "WHERE _id IN(:ids)")
|
}
|
||||||
abstract fun markDeletedInternal(ids: List<Long>)
|
|
||||||
|
|
||||||
fun markDeleted(ids: Iterable<Long>) {
|
fun delete(ids: List<Long>) = runBlocking {
|
||||||
ids.eachChunk(this::markDeletedInternal)
|
dao.delete(ids)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Query("SELECT gt_task FROM google_tasks WHERE gt_deleted = 0 AND gt_list_id = :listId")
|
fun markDeletedInternal(ids: List<Long>) = runBlocking {
|
||||||
abstract fun getActiveGoogleTasks(listId: String): List<Long>
|
dao.markDeletedInternal(ids)
|
||||||
|
}
|
||||||
|
|
||||||
@Delete
|
fun markDeleted(ids: Iterable<Long>) = runBlocking {
|
||||||
abstract fun deleteGoogleTaskList(googleTaskList: GoogleTaskList)
|
dao.markDeleted(ids)
|
||||||
|
}
|
||||||
|
|
||||||
@Transaction
|
fun getActiveGoogleTasks(listId: String): List<Long> = runBlocking {
|
||||||
open fun delete(googleTaskList: GoogleTaskList): List<Long> {
|
dao.getActiveGoogleTasks(listId)
|
||||||
val tasks = getActiveGoogleTasks(googleTaskList.remoteId!!)
|
|
||||||
delete(tasks)
|
|
||||||
deleteGoogleTaskList(googleTaskList)
|
|
||||||
return tasks
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete
|
fun deleteGoogleTaskList(googleTaskList: GoogleTaskList) = runBlocking {
|
||||||
abstract fun deleteGoogleTaskAccount(googleTaskAccount: GoogleTaskAccount)
|
dao.deleteGoogleTaskList(googleTaskList)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_task_lists WHERE gtl_account = :account ORDER BY gtl_title ASC")
|
fun delete(googleTaskList: GoogleTaskList): List<Long> = runBlocking {
|
||||||
abstract fun getLists(account: String): List<GoogleTaskList>
|
dao.delete(googleTaskList)
|
||||||
|
}
|
||||||
|
|
||||||
@Transaction
|
fun deleteGoogleTaskAccount(googleTaskAccount: GoogleTaskAccount) = runBlocking {
|
||||||
open fun delete(googleTaskAccount: GoogleTaskAccount): List<Long> {
|
dao.deleteGoogleTaskAccount(googleTaskAccount)
|
||||||
val deleted = ArrayList<Long>()
|
|
||||||
for (list in getLists(googleTaskAccount.account!!)) {
|
|
||||||
deleted.addAll(delete(list))
|
|
||||||
}
|
}
|
||||||
deleteGoogleTaskAccount(googleTaskAccount)
|
|
||||||
return deleted
|
fun getLists(account: String): List<GoogleTaskList> = runBlocking {
|
||||||
|
dao.getLists(account)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Query("SELECT cd_task FROM caldav_tasks WHERE cd_calendar = :calendar AND cd_deleted = 0")
|
fun delete(googleTaskAccount: GoogleTaskAccount): List<Long> = runBlocking {
|
||||||
abstract fun getActiveCaldavTasks(calendar: String): List<Long>
|
dao.delete(googleTaskAccount)
|
||||||
|
}
|
||||||
|
|
||||||
@Delete
|
fun getActiveCaldavTasks(calendar: String): List<Long> = runBlocking {
|
||||||
abstract fun deleteCaldavCalendar(caldavCalendar: CaldavCalendar)
|
dao.getActiveCaldavTasks(calendar)
|
||||||
|
}
|
||||||
|
|
||||||
@Transaction
|
fun deleteCaldavCalendar(caldavCalendar: CaldavCalendar) = runBlocking {
|
||||||
open fun delete(caldavCalendar: CaldavCalendar): List<Long> {
|
dao.deleteCaldavCalendar(caldavCalendar)
|
||||||
val tasks = getActiveCaldavTasks(caldavCalendar.uuid!!)
|
|
||||||
delete(tasks)
|
|
||||||
deleteCaldavCalendar(caldavCalendar)
|
|
||||||
return tasks
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM caldav_lists WHERE cdl_account = :account")
|
fun delete(caldavCalendar: CaldavCalendar): List<Long> = runBlocking {
|
||||||
abstract fun getCalendars(account: String): List<CaldavCalendar>
|
dao.delete(caldavCalendar)
|
||||||
|
}
|
||||||
|
|
||||||
@Delete
|
fun getCalendars(account: String): List<CaldavCalendar> = runBlocking {
|
||||||
abstract fun deleteCaldavAccount(caldavAccount: CaldavAccount)
|
dao.getCalendars(account)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("DELETE FROM tasks WHERE _id IN (SELECT _id FROM tasks INNER JOIN caldav_tasks ON _id = cd_task INNER JOIN caldav_lists ON cdl_uuid = cd_calendar WHERE cdl_account = '$LOCAL' AND deleted > 0)")
|
fun deleteCaldavAccount(caldavAccount: CaldavAccount) = runBlocking {
|
||||||
abstract fun purgeDeleted()
|
dao.deleteCaldavAccount(caldavAccount)
|
||||||
|
}
|
||||||
|
|
||||||
@Transaction
|
fun purgeDeleted() = runBlocking {
|
||||||
open fun delete(caldavAccount: CaldavAccount): List<Long> {
|
dao.purgeDeleted()
|
||||||
val deleted = ArrayList<Long>()
|
|
||||||
for (calendar in getCalendars(caldavAccount.uuid!!)) {
|
|
||||||
deleted.addAll(delete(calendar))
|
|
||||||
}
|
}
|
||||||
deleteCaldavAccount(caldavAccount)
|
|
||||||
return deleted
|
fun delete(caldavAccount: CaldavAccount): List<Long> = runBlocking {
|
||||||
|
dao.delete(caldavAccount)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,37 +1,43 @@
|
|||||||
package org.tasks.data
|
package org.tasks.data
|
||||||
|
|
||||||
import androidx.room.Dao
|
import kotlinx.coroutines.runBlocking
|
||||||
import androidx.room.Insert
|
import javax.inject.Inject
|
||||||
import androidx.room.Query
|
|
||||||
import androidx.room.Update
|
@Deprecated("use coroutines")
|
||||||
import com.todoroo.astrid.api.FilterListItem.NO_ORDER
|
class FilterDaoBlocking @Inject constructor(private val dao: FilterDao) {
|
||||||
|
fun update(filter: Filter) = runBlocking {
|
||||||
@Dao
|
dao.update(filter)
|
||||||
interface FilterDaoBlocking {
|
}
|
||||||
@Update
|
|
||||||
fun update(filter: Filter)
|
fun delete(id: Long) = runBlocking {
|
||||||
|
dao.delete(id)
|
||||||
@Query("DELETE FROM filters WHERE _id = :id")
|
}
|
||||||
fun delete(id: Long)
|
|
||||||
|
fun getByName(title: String): Filter? = runBlocking {
|
||||||
@Query("SELECT * FROM filters WHERE title = :title COLLATE NOCASE LIMIT 1")
|
dao.getByName(title)
|
||||||
fun getByName(title: String): Filter?
|
}
|
||||||
|
|
||||||
@Insert
|
fun insert(filter: Filter): Long = runBlocking {
|
||||||
fun insert(filter: Filter): Long
|
dao.insert(filter)
|
||||||
|
}
|
||||||
@Query("SELECT * FROM filters")
|
|
||||||
fun getFilters(): List<Filter>
|
fun getFilters(): List<Filter> = runBlocking {
|
||||||
|
dao.getFilters()
|
||||||
@Query("SELECT * FROM filters WHERE _id = :id LIMIT 1")
|
}
|
||||||
fun getById(id: Long): Filter?
|
|
||||||
|
fun getById(id: Long): Filter? = runBlocking {
|
||||||
@Query("SELECT * FROM filters")
|
dao.getById(id)
|
||||||
fun getAll(): List<Filter>
|
}
|
||||||
|
|
||||||
@Query("UPDATE filters SET f_order = $NO_ORDER")
|
fun getAll(): List<Filter> = runBlocking {
|
||||||
fun resetOrders()
|
dao.getAll()
|
||||||
|
}
|
||||||
@Query("UPDATE filters SET f_order = :order WHERE _id = :id")
|
|
||||||
fun setOrder(id: Long, order: Int)
|
fun resetOrders() = runBlocking {
|
||||||
|
dao.resetOrders()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setOrder(id: Long, order: Int) = runBlocking {
|
||||||
|
dao.setOrder(id, order)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -1,179 +1,137 @@
|
|||||||
package org.tasks.data
|
package org.tasks.data
|
||||||
|
|
||||||
import androidx.room.*
|
|
||||||
import com.todoroo.astrid.data.Task
|
import com.todoroo.astrid.data.Task
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
import org.tasks.time.DateTimeUtils.currentTimeMillis
|
import org.tasks.time.DateTimeUtils.currentTimeMillis
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
@Dao
|
@Deprecated("use coroutines")
|
||||||
abstract class GoogleTaskDaoBlocking {
|
class GoogleTaskDaoBlocking @Inject constructor(private val dao: GoogleTaskDao) {
|
||||||
@Insert
|
fun insert(task: GoogleTask): Long = runBlocking {
|
||||||
abstract fun insert(task: GoogleTask): Long
|
dao.insert(task)
|
||||||
|
|
||||||
@Insert
|
|
||||||
abstract fun insert(tasks: Iterable<GoogleTask>)
|
|
||||||
|
|
||||||
@Transaction
|
|
||||||
open fun insertAndShift(task: GoogleTask, top: Boolean) {
|
|
||||||
if (top) {
|
|
||||||
task.order = 0
|
|
||||||
shiftDown(task.listId!!, task.parent, 0)
|
|
||||||
} else {
|
|
||||||
task.order = getBottom(task.listId!!, task.parent)
|
|
||||||
}
|
|
||||||
task.id = insert(task)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Query("UPDATE google_tasks SET gt_order = gt_order + 1 WHERE gt_list_id = :listId AND gt_parent = :parent AND gt_order >= :position")
|
fun insert(tasks: Iterable<GoogleTask>) = runBlocking {
|
||||||
abstract fun shiftDown(listId: String, parent: Long, position: Long)
|
dao.insert(tasks)
|
||||||
|
|
||||||
@Query("UPDATE google_tasks SET gt_order = gt_order - 1 WHERE gt_list_id = :listId AND gt_parent = :parent AND gt_order > :from AND gt_order <= :to")
|
|
||||||
abstract fun shiftUp(listId: String, parent: Long, from: Long, to: Long)
|
|
||||||
|
|
||||||
@Query("UPDATE google_tasks SET gt_order = gt_order + 1 WHERE gt_list_id = :listId AND gt_parent = :parent AND gt_order < :from AND gt_order >= :to")
|
|
||||||
abstract fun shiftDown(listId: String, parent: Long, from: Long, to: Long)
|
|
||||||
|
|
||||||
@Query("UPDATE google_tasks SET gt_order = gt_order - 1 WHERE gt_list_id = :listId AND gt_parent = :parent AND gt_order >= :position")
|
|
||||||
abstract fun shiftUp(listId: String, parent: Long, position: Long)
|
|
||||||
|
|
||||||
@Transaction
|
|
||||||
open fun move(task: SubsetGoogleTask, newParent: Long, newPosition: Long) {
|
|
||||||
val previousParent = task.parent
|
|
||||||
val previousPosition = task.order
|
|
||||||
if (newParent == previousParent) {
|
|
||||||
if (previousPosition < newPosition) {
|
|
||||||
shiftUp(task.listId, newParent, previousPosition, newPosition)
|
|
||||||
} else {
|
|
||||||
shiftDown(task.listId, newParent, previousPosition, newPosition)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
shiftUp(task.listId, previousParent, previousPosition)
|
|
||||||
shiftDown(task.listId, newParent, newPosition)
|
|
||||||
}
|
}
|
||||||
task.parent = newParent
|
|
||||||
task.order = newPosition
|
|
||||||
update(task)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Query("UPDATE google_task_accounts SET gta_collapsed = :collapsed WHERE gta_id = :id")
|
|
||||||
abstract fun setCollapsed(id: Long, collapsed: Boolean)
|
|
||||||
|
|
||||||
@Query("SELECT * FROM google_tasks WHERE gt_task = :taskId AND gt_deleted = 0 LIMIT 1")
|
fun insertAndShift(task: GoogleTask, top: Boolean) = runBlocking {
|
||||||
abstract fun getByTaskId(taskId: Long): GoogleTask?
|
dao.insertAndShift(task, top)
|
||||||
|
|
||||||
@Update
|
|
||||||
abstract fun update(googleTask: GoogleTask)
|
|
||||||
|
|
||||||
private fun update(googleTask: SubsetGoogleTask) {
|
|
||||||
update(googleTask.id, googleTask.parent, googleTask.order)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Query("UPDATE google_tasks SET gt_order = :order, gt_parent = :parent, gt_moved = 1 WHERE gt_id = :id")
|
fun shiftDown(listId: String, parent: Long, position: Long) = runBlocking {
|
||||||
abstract fun update(id: Long, parent: Long, order: Long)
|
dao.shiftDown(listId, parent, position)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("UPDATE google_tasks SET gt_deleted = :now WHERE gt_task = :task OR gt_parent = :task")
|
fun shiftUp(listId: String, parent: Long, from: Long, to: Long) = runBlocking {
|
||||||
abstract fun markDeleted(task: Long, now: Long = currentTimeMillis())
|
dao.shiftUp(listId, parent, from, to)
|
||||||
|
}
|
||||||
|
|
||||||
@Delete
|
fun shiftDown(listId: String, parent: Long, from: Long, to: Long) = runBlocking {
|
||||||
abstract fun delete(deleted: GoogleTask)
|
dao.shiftDown(listId, parent, from, to)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_tasks WHERE gt_remote_id = :remoteId LIMIT 1")
|
fun shiftUp(listId: String, parent: Long, position: Long) = runBlocking {
|
||||||
abstract fun getByRemoteId(remoteId: String): GoogleTask?
|
dao.shiftUp(listId, parent, position)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_tasks WHERE gt_task = :taskId AND gt_deleted > 0")
|
fun move(task: SubsetGoogleTask, newParent: Long, newPosition: Long) = runBlocking {
|
||||||
abstract fun getDeletedByTaskId(taskId: Long): List<GoogleTask>
|
dao.move(task, newParent, newPosition)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_tasks WHERE gt_task = :taskId")
|
fun setCollapsed(id: Long, collapsed: Boolean) = runBlocking {
|
||||||
abstract fun getAllByTaskId(taskId: Long): List<GoogleTask>
|
dao.setCollapsed(id, collapsed)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT DISTINCT gt_list_id FROM google_tasks WHERE gt_deleted = 0 AND gt_task IN (:tasks)")
|
fun getByTaskId(taskId: Long): GoogleTask? = runBlocking {
|
||||||
abstract fun getLists(tasks: List<Long>): List<String>
|
dao.getByTaskId(taskId)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT gt_task FROM google_tasks WHERE gt_parent IN (:ids) AND gt_deleted = 0")
|
fun update(googleTask: GoogleTask) = runBlocking {
|
||||||
abstract fun getChildren(ids: List<Long>): List<Long>
|
dao.update(googleTask)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT tasks.* FROM tasks JOIN google_tasks ON tasks._id = gt_task WHERE gt_parent = :taskId")
|
fun update(id: Long, parent: Long, order: Long) = runBlocking {
|
||||||
abstract fun getChildTasks(taskId: Long): List<Task>
|
dao.update(id, parent, order)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_tasks WHERE gt_parent = :id AND gt_deleted = 0")
|
fun markDeleted(task: Long, now: Long = currentTimeMillis()) = runBlocking {
|
||||||
abstract fun getChildren(id: Long): List<GoogleTask>
|
dao.markDeleted(task, now)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT IFNULL(MAX(gt_order), -1) + 1 FROM google_tasks WHERE gt_list_id = :listId AND gt_parent = :parent")
|
fun delete(deleted: GoogleTask) = runBlocking {
|
||||||
abstract fun getBottom(listId: String, parent: Long): Long
|
dao.delete(deleted)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT gt_remote_id FROM google_tasks JOIN tasks ON tasks._id = gt_task WHERE deleted = 0 AND gt_list_id = :listId AND gt_parent = :parent AND gt_order < :order AND gt_remote_id IS NOT NULL AND gt_remote_id != '' ORDER BY gt_order DESC")
|
fun getByRemoteId(remoteId: String): GoogleTask? = runBlocking {
|
||||||
abstract fun getPrevious(listId: String, parent: Long, order: Long): String?
|
dao.getByRemoteId(remoteId)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT gt_remote_id FROM google_tasks WHERE gt_task = :task")
|
fun getDeletedByTaskId(taskId: Long): List<GoogleTask> = runBlocking {
|
||||||
abstract fun getRemoteId(task: Long): String?
|
dao.getDeletedByTaskId(taskId)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT gt_task FROM google_tasks WHERE gt_remote_id = :remoteId")
|
fun getAllByTaskId(taskId: Long): List<GoogleTask> = runBlocking {
|
||||||
abstract fun getTask(remoteId: String): Long
|
dao.getAllByTaskId(taskId)
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
|
fun getLists(tasks: List<Long>): List<String> = runBlocking {
|
||||||
@Query("SELECT google_tasks.*, gt_order AS primary_sort, NULL AS secondary_sort FROM google_tasks JOIN tasks ON tasks._id = gt_task WHERE gt_parent = 0 AND gt_list_id = :listId AND tasks.deleted = 0 UNION SELECT c.*, p.gt_order AS primary_sort, c.gt_order AS secondary_sort FROM google_tasks AS c LEFT JOIN google_tasks AS p ON c.gt_parent = p.gt_task JOIN tasks ON tasks._id = c.gt_task WHERE c.gt_parent > 0 AND c.gt_list_id = :listId AND tasks.deleted = 0 ORDER BY primary_sort ASC, secondary_sort ASC")
|
dao.getLists(tasks)
|
||||||
abstract fun getByLocalOrder(listId: String): List<GoogleTask>
|
}
|
||||||
|
|
||||||
@SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
|
fun getChildren(ids: List<Long>): List<Long> = runBlocking {
|
||||||
@Query("SELECT google_tasks.*, gt_remote_order AS primary_sort, NULL AS secondary_sort FROM google_tasks JOIN tasks ON tasks._id = gt_task WHERE gt_parent = 0 AND gt_list_id = :listId AND tasks.deleted = 0 UNION SELECT c.*, p.gt_remote_order AS primary_sort, c.gt_remote_order AS secondary_sort FROM google_tasks AS c LEFT JOIN google_tasks AS p ON c.gt_parent = p.gt_task JOIN tasks ON tasks._id = c.gt_task WHERE c.gt_parent > 0 AND c.gt_list_id = :listId AND tasks.deleted = 0 ORDER BY primary_sort ASC, secondary_sort ASC")
|
dao.getChildren(ids)
|
||||||
abstract fun getByRemoteOrder(listId: String): List<GoogleTask>
|
}
|
||||||
|
|
||||||
@Query("UPDATE google_tasks"
|
fun getChildTasks(taskId: Long): List<Task> = runBlocking {
|
||||||
+ " SET gt_parent = IFNULL(("
|
dao.getChildTasks(taskId)
|
||||||
+ " SELECT gt_task FROM google_tasks AS p"
|
}
|
||||||
+ " WHERE p.gt_remote_id = google_tasks.gt_remote_parent"
|
|
||||||
+ " AND p.gt_list_id = google_tasks.gt_list_id "
|
|
||||||
+ " AND p.gt_deleted = 0),"
|
|
||||||
+ " 0)"
|
|
||||||
+ " WHERE gt_moved = 0")
|
|
||||||
abstract fun updateParents()
|
|
||||||
|
|
||||||
@Query("UPDATE google_tasks SET gt_parent = IFNULL((SELECT gt_task FROM google_tasks AS p WHERE p.gt_remote_id = google_tasks.gt_remote_parent), 0) WHERE gt_list_id = :listId AND gt_moved = 0")
|
fun getChildren(id: Long): List<GoogleTask> = runBlocking {
|
||||||
abstract fun updateParents(listId: String)
|
dao.getChildren(id)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("UPDATE google_tasks SET gt_remote_parent = :parent, gt_remote_order = :position WHERE gt_remote_id = :id")
|
fun getBottom(listId: String, parent: Long): Long = runBlocking {
|
||||||
abstract fun updatePosition(id: String, parent: String, position: String)
|
dao.getBottom(listId, parent)
|
||||||
|
}
|
||||||
|
|
||||||
@Transaction
|
fun getPrevious(listId: String, parent: Long, order: Long): String? = runBlocking {
|
||||||
open fun reposition(listId: String) {
|
dao.getPrevious(listId, parent, order)
|
||||||
updateParents(listId)
|
|
||||||
val orderedTasks = getByRemoteOrder(listId)
|
|
||||||
var subtasks = 0L
|
|
||||||
var parent = 0L
|
|
||||||
for (task in orderedTasks) {
|
|
||||||
if (task.parent > 0) {
|
|
||||||
if (task.order != subtasks && !task.isMoved) {
|
|
||||||
task.order = subtasks
|
|
||||||
update(task)
|
|
||||||
}
|
}
|
||||||
subtasks++
|
|
||||||
} else {
|
fun getRemoteId(task: Long): String? = runBlocking {
|
||||||
subtasks = 0
|
dao.getRemoteId(task)
|
||||||
if (task.order != parent && !task.isMoved) {
|
|
||||||
task.order = parent
|
|
||||||
update(task)
|
|
||||||
}
|
}
|
||||||
parent++
|
|
||||||
|
fun getTask(remoteId: String): Long = runBlocking {
|
||||||
|
dao.getTask(remoteId)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun getByLocalOrder(listId: String): List<GoogleTask> = runBlocking {
|
||||||
|
dao.getByLocalOrder(listId)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun getByRemoteOrder(listId: String): List<GoogleTask> = runBlocking {
|
||||||
|
dao.getByRemoteOrder(listId)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun validateSorting(listId: String) {
|
fun updateParents() = runBlocking {
|
||||||
val orderedTasks = getByLocalOrder(listId)
|
dao.updateParents()
|
||||||
var subtasks = 0L
|
|
||||||
var parent = 0L
|
|
||||||
for (task in orderedTasks) {
|
|
||||||
if (task.parent > 0) {
|
|
||||||
if (task.order != subtasks) {
|
|
||||||
throw IllegalStateException("Subtask violation, expected $subtasks but was ${task.order}")
|
|
||||||
}
|
}
|
||||||
subtasks++
|
|
||||||
} else {
|
fun updateParents(listId: String) = runBlocking {
|
||||||
subtasks = 0
|
dao.updateParents(listId)
|
||||||
if (task.order != parent) {
|
|
||||||
throw IllegalStateException("Parent violation, expected $parent but was ${task.order}")
|
|
||||||
}
|
}
|
||||||
parent++
|
|
||||||
|
fun updatePosition(id: String, parent: String, position: String) = runBlocking {
|
||||||
|
dao.updatePosition(id, parent, position)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun reposition(listId: String) = runBlocking {
|
||||||
|
dao.reposition(listId)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun validateSorting(listId: String) = runBlocking {
|
||||||
|
dao.validateSorting(listId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,72 +1,86 @@
|
|||||||
package org.tasks.data
|
package org.tasks.data
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData
|
import androidx.lifecycle.LiveData
|
||||||
import androidx.room.*
|
import kotlinx.coroutines.runBlocking
|
||||||
import com.todoroo.astrid.api.FilterListItem.NO_ORDER
|
|
||||||
import org.tasks.filters.GoogleTaskFilters
|
import org.tasks.filters.GoogleTaskFilters
|
||||||
import org.tasks.time.DateTimeUtils.currentTimeMillis
|
import org.tasks.time.DateTimeUtils.currentTimeMillis
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
@Dao
|
@Deprecated("use coroutines")
|
||||||
interface GoogleTaskListDaoBlocking {
|
class GoogleTaskListDaoBlocking @Inject constructor(private val dao: GoogleTaskListDao) {
|
||||||
@Query("SELECT COUNT(*) FROM google_task_accounts")
|
fun accountCount(): Int = runBlocking {
|
||||||
fun accountCount(): Int
|
dao.accountCount()
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_task_accounts")
|
fun getAccounts(): List<GoogleTaskAccount> = runBlocking {
|
||||||
fun getAccounts(): List<GoogleTaskAccount>
|
dao.getAccounts()
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_task_accounts WHERE gta_account = :account COLLATE NOCASE LIMIT 1")
|
fun getAccount(account: String): GoogleTaskAccount? = runBlocking {
|
||||||
fun getAccount(account: String): GoogleTaskAccount?
|
dao.getAccount(account)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_task_lists WHERE gtl_id = :id")
|
fun getById(id: Long): GoogleTaskList? = runBlocking {
|
||||||
fun getById(id: Long): GoogleTaskList?
|
dao.getById(id)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_task_lists WHERE gtl_account = :account ORDER BY gtl_title ASC")
|
fun getLists(account: String): List<GoogleTaskList> = runBlocking {
|
||||||
fun getLists(account: String): List<GoogleTaskList>
|
dao.getLists(account)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_task_lists WHERE gtl_remote_id = :remoteId LIMIT 1")
|
fun getByRemoteId(remoteId: String): GoogleTaskList? = runBlocking {
|
||||||
fun getByRemoteId(remoteId: String): GoogleTaskList?
|
dao.getByRemoteId(remoteId)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_task_lists WHERE gtl_remote_id IN (:remoteIds)")
|
fun getByRemoteId(remoteIds: List<String>): List<GoogleTaskList> = runBlocking {
|
||||||
fun getByRemoteId(remoteIds: List<String>): List<GoogleTaskList>
|
dao.getByRemoteId(remoteIds)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_task_lists")
|
fun subscribeToLists(): LiveData<List<GoogleTaskList>> {
|
||||||
fun subscribeToLists(): LiveData<List<GoogleTaskList>>
|
return dao.subscribeToLists()
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_task_lists WHERE gtl_remote_id = :remoteId AND IFNULL(gtl_account, '') = ''")
|
fun findExistingList(remoteId: String): GoogleTaskList? = runBlocking {
|
||||||
fun findExistingList(remoteId: String): GoogleTaskList?
|
dao.findExistingList(remoteId)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM google_task_lists")
|
fun getAllLists(): List<GoogleTaskList> = runBlocking {
|
||||||
fun getAllLists(): List<GoogleTaskList>
|
dao.getAllLists()
|
||||||
|
}
|
||||||
|
|
||||||
@Query("UPDATE google_task_lists SET gtl_last_sync = 0 WHERE gtl_account = :account")
|
fun resetLastSync(account: String) = runBlocking {
|
||||||
fun resetLastSync(account: String)
|
dao.resetLastSync(account)
|
||||||
|
}
|
||||||
|
|
||||||
@Insert(onConflict = OnConflictStrategy.REPLACE)
|
fun insertOrReplace(googleTaskList: GoogleTaskList): Long = runBlocking {
|
||||||
fun insertOrReplace(googleTaskList: GoogleTaskList): Long
|
dao.insertOrReplace(googleTaskList)
|
||||||
|
}
|
||||||
|
|
||||||
@Insert
|
fun insert(googleTaskList: GoogleTaskList): Long = runBlocking {
|
||||||
fun insert(googleTaskList: GoogleTaskList): Long
|
dao.insert(googleTaskList)
|
||||||
|
}
|
||||||
|
|
||||||
@Insert
|
fun insert(googleTaskAccount: GoogleTaskAccount) = runBlocking {
|
||||||
fun insert(googleTaskAccount: GoogleTaskAccount)
|
dao.insert(googleTaskAccount)
|
||||||
|
}
|
||||||
|
|
||||||
@Update
|
fun update(account: GoogleTaskAccount) = runBlocking {
|
||||||
fun update(account: GoogleTaskAccount)
|
dao.update(account)
|
||||||
|
}
|
||||||
|
|
||||||
@Update
|
fun update(list: GoogleTaskList) = runBlocking {
|
||||||
fun update(list: GoogleTaskList)
|
dao.update(list)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT google_task_lists.*, COUNT(tasks._id) AS count"
|
fun getGoogleTaskFilters(account: String, now: Long = currentTimeMillis()): List<GoogleTaskFilters> = runBlocking {
|
||||||
+ " FROM google_task_lists "
|
dao.getGoogleTaskFilters(account, now)
|
||||||
+ " LEFT JOIN google_tasks ON google_tasks.gt_list_id = google_task_lists.gtl_remote_id"
|
}
|
||||||
+ " LEFT JOIN tasks ON google_tasks.gt_task = tasks._id AND tasks.deleted = 0 AND tasks.completed = 0 AND tasks.hideUntil < :now AND gt_deleted = 0"
|
|
||||||
+ " WHERE google_task_lists.gtl_account = :account"
|
|
||||||
+ " GROUP BY google_task_lists.gtl_remote_id")
|
|
||||||
fun getGoogleTaskFilters(account: String, now: Long = currentTimeMillis()): List<GoogleTaskFilters>
|
|
||||||
|
|
||||||
@Query("UPDATE google_task_lists SET gtl_remote_order = $NO_ORDER")
|
fun resetOrders() = runBlocking {
|
||||||
fun resetOrders()
|
dao.resetOrders()
|
||||||
|
}
|
||||||
|
|
||||||
@Query("UPDATE google_task_lists SET gtl_remote_order = :order WHERE gtl_id = :id")
|
fun setOrder(id: Long, order: Int) = runBlocking {
|
||||||
fun setOrder(id: Long, order: Int)
|
dao.setOrder(id, order)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -1,118 +1,114 @@
|
|||||||
package org.tasks.data
|
package org.tasks.data
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData
|
import androidx.lifecycle.LiveData
|
||||||
import androidx.room.*
|
import kotlinx.coroutines.runBlocking
|
||||||
import com.todoroo.astrid.api.FilterListItem.NO_ORDER
|
|
||||||
import org.tasks.filters.LocationFilters
|
import org.tasks.filters.LocationFilters
|
||||||
import org.tasks.time.DateTimeUtils.currentTimeMillis
|
import org.tasks.time.DateTimeUtils.currentTimeMillis
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
@Dao
|
@Deprecated("use coroutines")
|
||||||
interface LocationDaoBlocking {
|
class LocationDaoBlocking @Inject constructor(private val dao: LocationDao) {
|
||||||
@Query("SELECT places.*"
|
fun getPlacesWithGeofences(): List<Place> = runBlocking {
|
||||||
+ " FROM places"
|
dao.getPlacesWithGeofences()
|
||||||
+ " INNER JOIN geofences ON geofences.place = places.uid"
|
}
|
||||||
+ " INNER JOIN tasks ON geofences.task = tasks._id"
|
|
||||||
+ " WHERE tasks.completed = 0 AND tasks.deleted = 0"
|
|
||||||
+ " AND (geofences.arrival > 0 OR geofences.departure > 0)"
|
|
||||||
+ " GROUP BY places.uid")
|
|
||||||
fun getPlacesWithGeofences(): List<Place>
|
|
||||||
|
|
||||||
@Query("SELECT places.*,"
|
|
||||||
+ " max(geofences.arrival) as arrival,"
|
|
||||||
+ " max(geofences.departure) as departure,"
|
|
||||||
+ " min(geofences.radius) as radius"
|
|
||||||
+ " FROM places"
|
|
||||||
+ " INNER JOIN geofences ON geofences.place = places.uid"
|
|
||||||
+ " INNER JOIN tasks ON tasks._id = geofences.task"
|
|
||||||
+ " WHERE place = :uid AND tasks.completed = 0 AND tasks.deleted = 0"
|
|
||||||
+ " AND (geofences.arrival > 0 OR geofences.departure > 0)"
|
|
||||||
+ " GROUP BY places.uid")
|
|
||||||
fun getGeofencesByPlace(uid: String): MergedGeofence?
|
|
||||||
|
|
||||||
@Query("DELETE FROM geofences WHERE place = :place")
|
|
||||||
fun deleteGeofencesByPlace(place: String)
|
|
||||||
|
|
||||||
@Query("SELECT geofences.* FROM geofences"
|
|
||||||
+ " INNER JOIN tasks ON tasks._id = geofences.task"
|
|
||||||
+ " WHERE place = :place AND arrival = 1 AND tasks.completed = 0"
|
|
||||||
+ " AND tasks.deleted = 0 AND tasks.snoozeTime < :now AND tasks.hideUntil < :now")
|
|
||||||
fun getArrivalGeofences(place: String, now: Long): List<Geofence>
|
|
||||||
|
|
||||||
@Query("SELECT geofences.* FROM geofences"
|
|
||||||
+ " INNER JOIN tasks ON tasks._id = geofences.task"
|
|
||||||
+ " WHERE place = :place AND departure = 1 AND tasks.completed = 0"
|
|
||||||
+ " AND tasks.deleted = 0 AND tasks.snoozeTime < :now AND tasks.hideUntil < :now")
|
|
||||||
fun getDepartureGeofences(place: String, now: Long): List<Geofence>
|
|
||||||
|
|
||||||
@Query("SELECT * FROM geofences"
|
|
||||||
+ " INNER JOIN places ON geofences.place = places.uid"
|
|
||||||
+ " WHERE task = :taskId ORDER BY name ASC LIMIT 1")
|
|
||||||
fun getGeofences(taskId: Long): Location?
|
|
||||||
|
|
||||||
@Query("SELECT geofences.*, places.* FROM geofences INNER JOIN places ON geofences.place = places.uid INNER JOIN tasks ON tasks._id = geofences.task WHERE tasks._id = :taskId AND tasks.deleted = 0 AND tasks.completed = 0")
|
|
||||||
fun getActiveGeofences(taskId: Long): List<Location>
|
|
||||||
|
|
||||||
@Query("SELECT places.*"
|
|
||||||
+ " FROM places"
|
|
||||||
+ " INNER JOIN geofences ON geofences.place = places.uid"
|
|
||||||
+ " WHERE geofences.task = :taskId")
|
|
||||||
fun getPlaceForTask(taskId: Long): Place?
|
|
||||||
|
|
||||||
@Query("SELECT geofences.*, places.* FROM geofences INNER JOIN places ON geofences.place = places.uid INNER JOIN tasks ON tasks._id = geofences.task WHERE tasks.deleted = 0 AND tasks.completed = 0")
|
|
||||||
fun getActiveGeofences(): List<Location>
|
|
||||||
|
|
||||||
@Query("SELECT COUNT(*) FROM geofences")
|
|
||||||
suspend fun geofenceCount(): Int
|
|
||||||
|
|
||||||
@Delete
|
|
||||||
fun delete(location: Geofence)
|
|
||||||
|
|
||||||
@Delete
|
|
||||||
fun delete(place: Place)
|
|
||||||
|
|
||||||
@Insert
|
|
||||||
fun insert(location: Geofence): Long
|
|
||||||
|
|
||||||
@Insert(onConflict = OnConflictStrategy.IGNORE)
|
|
||||||
fun insert(place: Place): Long
|
|
||||||
|
|
||||||
@Update
|
|
||||||
fun update(place: Place)
|
|
||||||
|
|
||||||
@Update
|
|
||||||
fun update(geofence: Geofence)
|
|
||||||
|
|
||||||
@Query("SELECT * FROM places WHERE uid = :uid LIMIT 1")
|
|
||||||
fun getByUid(uid: String): Place?
|
|
||||||
|
|
||||||
@Query("SELECT * FROM geofences WHERE task = :taskId")
|
|
||||||
fun getGeofencesForTask(taskId: Long): List<Geofence>
|
|
||||||
|
|
||||||
@Query("SELECT * FROM places")
|
|
||||||
fun getPlaces(): List<Place>
|
|
||||||
|
|
||||||
@Query("SELECT * FROM places WHERE place_id = :id")
|
|
||||||
fun getPlace(id: Long): Place?
|
|
||||||
|
|
||||||
@Query("SELECT * FROM places WHERE uid = :uid")
|
|
||||||
fun getPlace(uid: String): Place?
|
|
||||||
|
|
||||||
@Query("SELECT places.*, IFNULL(COUNT(geofence_id),0) AS count FROM places LEFT OUTER JOIN geofences ON geofences.place = places.uid GROUP BY uid ORDER BY COUNT(geofence_id) DESC")
|
|
||||||
fun getPlaceUsage(): LiveData<List<PlaceUsage>>
|
|
||||||
|
|
||||||
@Query("SELECT * FROM places WHERE latitude LIKE :latitude AND longitude LIKE :longitude")
|
|
||||||
fun findPlace(latitude: String, longitude: String): Place?
|
|
||||||
|
|
||||||
@Query("SELECT places.*, COUNT(tasks._id) AS count FROM places "
|
|
||||||
+ " LEFT JOIN geofences ON geofences.place = places.uid "
|
|
||||||
+ " LEFT JOIN tasks ON geofences.task = tasks._id AND tasks.completed = 0 AND tasks.deleted = 0 AND tasks.hideUntil < :now"
|
|
||||||
+ " GROUP BY places.uid"
|
|
||||||
+ " ORDER BY name COLLATE NOCASE ASC")
|
|
||||||
fun getPlaceFilters(now: Long = currentTimeMillis()): List<LocationFilters>
|
|
||||||
|
|
||||||
@Query("UPDATE places SET place_order = $NO_ORDER")
|
|
||||||
fun resetOrders()
|
|
||||||
|
|
||||||
@Query("UPDATE places SET place_order = :order WHERE place_id = :id")
|
fun getGeofencesByPlace(uid: String): MergedGeofence? = runBlocking {
|
||||||
fun setOrder(id: Long, order: Int)
|
dao.getGeofencesByPlace(uid)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun deleteGeofencesByPlace(place: String) = runBlocking {
|
||||||
|
dao.deleteGeofencesByPlace(place)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getArrivalGeofences(place: String, now: Long): List<Geofence> = runBlocking {
|
||||||
|
dao.getArrivalGeofences(place, now)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getDepartureGeofences(place: String, now: Long): List<Geofence> = runBlocking {
|
||||||
|
dao.getDepartureGeofences(place, now)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getGeofences(taskId: Long): Location? = runBlocking {
|
||||||
|
dao.getGeofences(taskId)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getActiveGeofences(taskId: Long): List<Location> = runBlocking {
|
||||||
|
dao.getActiveGeofences(taskId)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getPlaceForTask(taskId: Long): Place? = runBlocking {
|
||||||
|
dao.getPlaceForTask(taskId)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getActiveGeofences(): List<Location> = runBlocking {
|
||||||
|
dao.getActiveGeofences()
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun geofenceCount(): Int {
|
||||||
|
return dao.geofenceCount()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun delete(location: Geofence) = runBlocking {
|
||||||
|
dao.delete(location)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun delete(place: Place) = runBlocking {
|
||||||
|
dao.delete(place)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun insert(location: Geofence): Long = runBlocking {
|
||||||
|
dao.insert(location)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun insert(place: Place): Long = runBlocking {
|
||||||
|
dao.insert(place)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun update(place: Place) = runBlocking {
|
||||||
|
dao.update(place)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun update(geofence: Geofence) = runBlocking {
|
||||||
|
dao.update(geofence)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getByUid(uid: String): Place? = runBlocking {
|
||||||
|
dao.getByUid(uid)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getGeofencesForTask(taskId: Long): List<Geofence> = runBlocking {
|
||||||
|
dao.getGeofencesForTask(taskId)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getPlaces(): List<Place> = runBlocking {
|
||||||
|
dao.getPlaces()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getPlace(id: Long): Place? = runBlocking {
|
||||||
|
dao.getPlace(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getPlace(uid: String): Place? = runBlocking {
|
||||||
|
dao.getPlace(uid)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getPlaceUsage(): LiveData<List<PlaceUsage>> {
|
||||||
|
return dao.getPlaceUsage()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun findPlace(latitude: String, longitude: String): Place? = runBlocking {
|
||||||
|
dao.findPlace(latitude, longitude)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getPlaceFilters(now: Long = currentTimeMillis()): List<LocationFilters> = runBlocking {
|
||||||
|
dao.getPlaceFilters(now)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun resetOrders() = runBlocking {
|
||||||
|
dao.resetOrders()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setOrder(id: Long, order: Int) = runBlocking {
|
||||||
|
dao.setOrder(id, order)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -1,49 +1,48 @@
|
|||||||
package org.tasks.data
|
package org.tasks.data
|
||||||
|
|
||||||
import androidx.room.*
|
|
||||||
import com.todoroo.astrid.data.Task
|
import com.todoroo.astrid.data.Task
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
@Dao
|
@Deprecated("use coroutines")
|
||||||
abstract class TagDaoBlocking {
|
class TagDaoBlocking @Inject constructor(private val dao: TagDao) {
|
||||||
@Query("UPDATE tags SET name = :name WHERE tag_uid = :tagUid")
|
fun rename(tagUid: String, name: String) = runBlocking {
|
||||||
abstract fun rename(tagUid: String, name: String)
|
dao.rename(tagUid, name)
|
||||||
|
}
|
||||||
@Insert
|
|
||||||
abstract fun insert(tag: Tag)
|
|
||||||
|
|
||||||
@Insert
|
fun insert(tag: Tag) = runBlocking {
|
||||||
abstract fun insert(tags: Iterable<Tag>)
|
dao.insert(tag)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("DELETE FROM tags WHERE task = :taskId AND tag_uid in (:tagUids)")
|
fun insert(tags: Iterable<Tag>) = runBlocking {
|
||||||
abstract fun deleteTags(taskId: Long, tagUids: List<String>)
|
dao.insert(tags)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM tags WHERE tag_uid = :tagUid")
|
fun deleteTags(taskId: Long, tagUids: List<String>) = runBlocking {
|
||||||
abstract fun getByTagUid(tagUid: String): List<Tag>
|
dao.deleteTags(taskId, tagUids)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM tags WHERE task = :taskId")
|
fun getByTagUid(tagUid: String): List<Tag> = runBlocking {
|
||||||
abstract fun getTagsForTask(taskId: Long): List<Tag>
|
dao.getByTagUid(tagUid)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM tags WHERE task = :taskId AND tag_uid = :tagUid")
|
fun getTagsForTask(taskId: Long): List<Tag> = runBlocking {
|
||||||
abstract fun getTagByTaskAndTagUid(taskId: Long, tagUid: String): Tag?
|
dao.getTagsForTask(taskId)
|
||||||
|
}
|
||||||
|
|
||||||
@Delete
|
fun getTagByTaskAndTagUid(taskId: Long, tagUid: String): Tag? = runBlocking {
|
||||||
abstract fun delete(tags: List<Tag>)
|
dao.getTagByTaskAndTagUid(taskId, tagUid)
|
||||||
|
}
|
||||||
|
|
||||||
@Transaction
|
fun delete(tags: List<Tag>) = runBlocking {
|
||||||
open fun applyTags(task: Task, tagDataDao: TagDataDaoBlocking, current: List<TagData>): Boolean {
|
dao.delete(tags)
|
||||||
val taskId = task.id
|
|
||||||
val existing = HashSet(tagDataDao.getTagDataForTask(taskId))
|
|
||||||
val selected = HashSet<TagData>(current)
|
|
||||||
val added = selected subtract existing
|
|
||||||
val removed = existing subtract selected
|
|
||||||
deleteTags(taskId, removed.map { td -> td.remoteId!! })
|
|
||||||
insert(task, added)
|
|
||||||
return removed.isNotEmpty() || added.isNotEmpty()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun insert(task: Task, tags: Collection<TagData>) {
|
fun applyTags(task: Task, tagDataDao: TagDataDaoBlocking, current: List<TagData>): Boolean = runBlocking {
|
||||||
if (!tags.isEmpty()) {
|
dao.applyTags(task, tagDataDao, current)
|
||||||
insert(tags.map { Tag(task, it) })
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun insert(task: Task, tags: Collection<TagData>) = runBlocking {
|
||||||
|
dao.insert(task, tags)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,33 +1,35 @@
|
|||||||
package org.tasks.data
|
package org.tasks.data
|
||||||
|
|
||||||
import androidx.room.*
|
import kotlinx.coroutines.runBlocking
|
||||||
import com.todoroo.astrid.data.Task
|
import javax.inject.Inject
|
||||||
import com.todoroo.astrid.helper.UUIDHelper
|
|
||||||
|
|
||||||
@Dao
|
@Deprecated("use coroutines")
|
||||||
abstract class TaskAttachmentDaoBlocking {
|
class TaskAttachmentDaoBlocking @Inject constructor(private val dao: TaskAttachmentDao) {
|
||||||
@Query("SELECT * FROM task_attachments WHERE task_id = :taskUuid")
|
fun getAttachments(taskUuid: String): List<TaskAttachment> = runBlocking {
|
||||||
abstract fun getAttachments(taskUuid: String): List<TaskAttachment>
|
dao.getAttachments(taskUuid)
|
||||||
|
}
|
||||||
@Query("SELECT task_attachments.* FROM task_attachments INNER JOIN tasks ON tasks._id = :task WHERE task_id = tasks.remoteId")
|
|
||||||
abstract fun getAttachments(task: Long): List<TaskAttachment>
|
|
||||||
|
|
||||||
@Query("SELECT * FROM task_attachments")
|
fun getAttachments(task: Long): List<TaskAttachment> = runBlocking {
|
||||||
abstract fun getAttachments(): List<TaskAttachment>
|
dao.getAttachments(task)
|
||||||
|
}
|
||||||
|
|
||||||
@Delete
|
fun getAttachments(): List<TaskAttachment> = runBlocking {
|
||||||
abstract fun delete(taskAttachment: TaskAttachment)
|
dao.getAttachments()
|
||||||
|
}
|
||||||
|
|
||||||
@Insert(onConflict = OnConflictStrategy.REPLACE)
|
fun delete(taskAttachment: TaskAttachment) = runBlocking {
|
||||||
abstract fun insert(attachment: TaskAttachment)
|
dao.delete(taskAttachment)
|
||||||
|
}
|
||||||
|
|
||||||
@Update
|
fun insert(attachment: TaskAttachment) = runBlocking {
|
||||||
abstract fun update(attachment: TaskAttachment)
|
dao.insert(attachment)
|
||||||
|
}
|
||||||
|
|
||||||
fun createNew(attachment: TaskAttachment) {
|
fun update(attachment: TaskAttachment) = runBlocking {
|
||||||
if (Task.isUuidEmpty(attachment.remoteId)) {
|
dao.update(attachment)
|
||||||
attachment.remoteId = UUIDHelper.newUUID()
|
|
||||||
}
|
}
|
||||||
insert(attachment)
|
|
||||||
|
fun createNew(attachment: TaskAttachment) = runBlocking {
|
||||||
|
dao.createNew(attachment)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,25 +1,27 @@
|
|||||||
package org.tasks.data
|
package org.tasks.data
|
||||||
|
|
||||||
import androidx.room.Dao
|
import kotlinx.coroutines.runBlocking
|
||||||
import androidx.room.Insert
|
import javax.inject.Inject
|
||||||
import androidx.room.Query
|
|
||||||
import androidx.room.Update
|
|
||||||
|
|
||||||
@Dao
|
@Deprecated("use coroutines")
|
||||||
abstract class TaskListMetadataDaoBlocking {
|
class TaskListMetadataDaoBlocking @Inject constructor(private val dao: TaskListMetadataDao) {
|
||||||
@Query("SELECT * from task_list_metadata where tag_uuid = :tagUuid OR filter = :tagUuid LIMIT 1")
|
fun fetchByTagOrFilter(tagUuid: String): TaskListMetadata? = runBlocking {
|
||||||
abstract fun fetchByTagOrFilter(tagUuid: String): TaskListMetadata?
|
dao.fetchByTagOrFilter(tagUuid)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM task_list_metadata")
|
fun getAll(): List<TaskListMetadata> = runBlocking {
|
||||||
abstract fun getAll(): List<TaskListMetadata>
|
dao.getAll()
|
||||||
|
}
|
||||||
|
|
||||||
@Update
|
fun update(taskListMetadata: TaskListMetadata) = runBlocking {
|
||||||
abstract fun update(taskListMetadata: TaskListMetadata)
|
dao.update(taskListMetadata)
|
||||||
|
}
|
||||||
|
|
||||||
@Insert
|
fun insert(taskListMetadata: TaskListMetadata): Long = runBlocking {
|
||||||
abstract fun insert(taskListMetadata: TaskListMetadata): Long
|
dao.insert(taskListMetadata)
|
||||||
|
}
|
||||||
|
|
||||||
fun createNew(taskListMetadata: TaskListMetadata) {
|
fun createNew(taskListMetadata: TaskListMetadata) = runBlocking {
|
||||||
taskListMetadata.id = insert(taskListMetadata)
|
dao.createNew(taskListMetadata)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,37 +1,35 @@
|
|||||||
package org.tasks.data
|
package org.tasks.data
|
||||||
|
|
||||||
import androidx.room.*
|
import kotlinx.coroutines.runBlocking
|
||||||
import com.todoroo.andlib.utility.DateUtilities
|
import javax.inject.Inject
|
||||||
import com.todoroo.astrid.data.Task
|
|
||||||
import com.todoroo.astrid.helper.UUIDHelper
|
|
||||||
|
|
||||||
@Dao
|
@Deprecated("use coroutines")
|
||||||
abstract class UserActivityDaoBlocking {
|
class UserActivityDaoBlocking @Inject constructor(private val dao: UserActivityDao) {
|
||||||
@Insert
|
fun insert(userActivity: UserActivity) = runBlocking {
|
||||||
abstract fun insert(userActivity: UserActivity)
|
dao.insert(userActivity)
|
||||||
|
}
|
||||||
@Update
|
|
||||||
abstract fun update(userActivity: UserActivity)
|
|
||||||
|
|
||||||
@Delete
|
|
||||||
abstract fun delete(userActivity: UserActivity)
|
|
||||||
|
|
||||||
@Query("SELECT * FROM userActivity WHERE target_id = :taskUuid ORDER BY created_at DESC ")
|
fun update(userActivity: UserActivity) = runBlocking {
|
||||||
abstract fun getCommentsForTask(taskUuid: String): List<UserActivity>
|
dao.update(userActivity)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT userActivity.* FROM userActivity INNER JOIN tasks ON tasks._id = :task WHERE target_id = tasks.remoteId")
|
fun delete(userActivity: UserActivity) = runBlocking {
|
||||||
abstract fun getComments(task: Long): List<UserActivity>
|
dao.delete(userActivity)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM userActivity")
|
fun getCommentsForTask(taskUuid: String): List<UserActivity> = runBlocking {
|
||||||
abstract fun getComments(): List<UserActivity>
|
dao.getCommentsForTask(taskUuid)
|
||||||
|
}
|
||||||
|
|
||||||
fun createNew(item: UserActivity) {
|
fun getComments(task: Long): List<UserActivity> = runBlocking {
|
||||||
if (item.created == null || item.created == 0L) {
|
dao.getComments(task)
|
||||||
item.created = DateUtilities.now()
|
|
||||||
}
|
}
|
||||||
if (Task.isUuidEmpty(item.remoteId)) {
|
|
||||||
item.remoteId = UUIDHelper.newUUID()
|
fun getComments(): List<UserActivity> = runBlocking {
|
||||||
|
dao.getComments()
|
||||||
}
|
}
|
||||||
insert(item)
|
|
||||||
|
fun createNew(item: UserActivity) = runBlocking {
|
||||||
|
dao.createNew(item)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,27 +1,31 @@
|
|||||||
package org.tasks.notifications
|
package org.tasks.notifications
|
||||||
|
|
||||||
import androidx.room.Dao
|
import kotlinx.coroutines.runBlocking
|
||||||
import androidx.room.Insert
|
import javax.inject.Inject
|
||||||
import androidx.room.OnConflictStrategy
|
|
||||||
import androidx.room.Query
|
|
||||||
|
|
||||||
@Dao
|
@Deprecated("use coroutines")
|
||||||
interface NotificationDaoBlocking {
|
class NotificationDaoBlocking @Inject constructor(private val dao: NotificationDao) {
|
||||||
@Query("SELECT task FROM notification")
|
fun getAll(): List<Long> = runBlocking {
|
||||||
fun getAll(): List<Long>
|
dao.getAll()
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT * FROM notification ORDER BY timestamp DESC")
|
fun getAllOrdered(): List<Notification> = runBlocking {
|
||||||
fun getAllOrdered(): List<Notification>
|
dao.getAllOrdered()
|
||||||
|
}
|
||||||
|
|
||||||
@Insert(onConflict = OnConflictStrategy.REPLACE)
|
fun insertAll(notifications: List<Notification>) = runBlocking {
|
||||||
fun insertAll(notifications: List<Notification>)
|
dao.insertAll(notifications)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("DELETE FROM notification WHERE task = :taskId")
|
fun delete(taskId: Long) = runBlocking {
|
||||||
fun delete(taskId: Long)
|
dao.delete(taskId)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("DELETE FROM notification WHERE task IN(:taskIds)")
|
fun deleteAll(taskIds: List<Long>) = runBlocking {
|
||||||
fun deleteAll(taskIds: List<Long>)
|
dao.deleteAll(taskIds)
|
||||||
|
}
|
||||||
|
|
||||||
@Query("SELECT MAX(timestamp) FROM notification")
|
fun latestTimestamp(): Long = runBlocking {
|
||||||
fun latestTimestamp(): Long
|
dao.latestTimestamp()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue