From 4f87a0a5c98a5bd4761d1bd533f9e52f91268a53 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 27 Nov 2019 09:19:04 -0600 Subject: [PATCH] Fix room warnings --- app/src/main/java/org/tasks/data/CaldavDao.java | 2 +- app/src/main/java/org/tasks/data/GoogleTaskDao.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/tasks/data/CaldavDao.java b/app/src/main/java/org/tasks/data/CaldavDao.java index 6a5218fed..6c9349f95 100644 --- a/app/src/main/java/org/tasks/data/CaldavDao.java +++ b/app/src/main/java/org/tasks/data/CaldavDao.java @@ -109,7 +109,7 @@ public abstract class CaldavDao { public abstract CaldavAccount getAccountByName(String name); @Query( - "SELECT * from caldav_accounts" + "SELECT caldav_accounts.* from caldav_accounts" + " INNER JOIN caldav_tasks ON cd_task = :task" + " INNER JOIN caldav_lists ON cd_calendar = cdl_uuid" + " WHERE cdl_account = cda_uuid") diff --git a/app/src/main/java/org/tasks/data/GoogleTaskDao.java b/app/src/main/java/org/tasks/data/GoogleTaskDao.java index f123b4675..cedd04aa9 100644 --- a/app/src/main/java/org/tasks/data/GoogleTaskDao.java +++ b/app/src/main/java/org/tasks/data/GoogleTaskDao.java @@ -123,7 +123,7 @@ public abstract class GoogleTaskDao { "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") abstract List getByLocalOrder(String listId); - @SuppressWarnings({RoomWarnings.CURSOR_MISMATCH, "AndroidUnresolvedRoomSqlReference"}) + @SuppressWarnings({RoomWarnings.CURSOR_MISMATCH}) @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") abstract List getByRemoteOrder(String listId);