From f57975b0d8aa2d2b8b39bb60ba98b384fe748520 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 22 Jan 2013 13:10:13 -0800 Subject: [PATCH] DatabaseDao.updateMultiple is redundant with DatabaseDao.update --- api/src/com/todoroo/andlib/data/DatabaseDao.java | 14 -------------- .../astrid/actfm/sync/ActFmDataService.java | 9 --------- .../com/todoroo/astrid/service/TaskService.java | 6 +++--- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/api/src/com/todoroo/andlib/data/DatabaseDao.java b/api/src/com/todoroo/andlib/data/DatabaseDao.java index 0ab8a6cf2..d49b3f58b 100644 --- a/api/src/com/todoroo/andlib/data/DatabaseDao.java +++ b/api/src/com/todoroo/andlib/data/DatabaseDao.java @@ -357,20 +357,6 @@ public class DatabaseDao { return true; } - /** - * Updates multiple rows of the database based on model set values - * - * @param item - * item model - * @param criterion - * @return returns true on success. - */ - public int updateMultiple(ContentValues values, Criterion criterion) { - if(values.size() == 0) // nothing changed - return 0; - return database.update(table.name, values, criterion.toString(), null); - } - // --- helper methods diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmDataService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmDataService.java index 98de05b6b..619cdb331 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmDataService.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmDataService.java @@ -60,15 +60,6 @@ public final class ActFmDataService { // --- task and metadata methods - /** - * Clears metadata information. Used when user logs out of service - */ - public void clearMetadata() { - ContentValues values = new ContentValues(); - values.putNull(Task.REMOTE_ID.name); - taskDao.updateMultiple(values, Criterion.all); - } - /** * Currently, this method does nothing, there is an alternate method to create tasks * @param properties diff --git a/astrid/src/com/todoroo/astrid/service/TaskService.java b/astrid/src/com/todoroo/astrid/service/TaskService.java index b65927ba8..fcf5aa338 100644 --- a/astrid/src/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/com/todoroo/astrid/service/TaskService.java @@ -357,9 +357,9 @@ public class TaskService { * @return # of affected rows */ public int clearDetails(Criterion criterion) { - ContentValues values = new ContentValues(); - values.put(Task.DETAILS_DATE.name, 0); - return taskDao.updateMultiple(values, criterion); + Task template = new Task(); + template.setValue(Task.DETAILS_DATE, 0L); + return taskDao.update(criterion, template); } /**