From b9d7d8de6dd92d54720a6dbf74bd122dede6c267 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 8 Feb 2018 16:10:46 -0600 Subject: [PATCH] Remove anonymous class --- app/src/main/java/com/todoroo/astrid/dao/TaskDao.java | 11 +---------- .../java/org/tasks/data/LimitOffsetDataSource.java | 4 ++-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java index a29161315..f597e0bc2 100644 --- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java +++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java @@ -265,16 +265,7 @@ public abstract class TaskDao { .select(properties) .withQueryTemplate(PermaSql.replacePlaceholders(queryTemplate)) .from(Task.TABLE).toString(); - return new LimitOffsetDataSource(database, query) { - @Override - protected List convertRows(Cursor cursor) { - List result = new ArrayList<>(); - while (cursor.moveToNext()) { - result.add(new Task(cursor)); - } - return result; - } - }; + return new LimitOffsetDataSource(database, query); } } diff --git a/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java b/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java index 93e2e45a1..423a448c2 100644 --- a/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java +++ b/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java @@ -13,13 +13,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public abstract class LimitOffsetDataSource extends PositionalDataSource { +public class LimitOffsetDataSource extends PositionalDataSource { private final String mCountQuery; private final String mLimitOffsetQuery; private final RoomDatabase mDb; - protected LimitOffsetDataSource(RoomDatabase db, String query) { + public LimitOffsetDataSource(RoomDatabase db, String query) { mDb = db; mCountQuery = "SELECT COUNT(*) FROM ( " + query + " )"; mLimitOffsetQuery = "SELECT * FROM ( " + query + " ) LIMIT ? OFFSET ?";