Replace TaskService with TaskDao

pull/467/head
Alex Baker 8 years ago
parent c6a3ff3604
commit a44368123d

@ -4,8 +4,8 @@ import android.content.ContentValues;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -27,7 +27,7 @@ import static org.tasks.time.DateTimeUtils.currentTimeMillis;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class TaskTest extends InjectingTestCase { public class TaskTest extends InjectingTestCase {
@Inject TaskService taskService; @Inject TaskDao taskDao;
@Inject Preferences preferences; @Inject Preferences preferences;
@Test @Test
@ -39,7 +39,7 @@ public class TaskTest extends InjectingTestCase {
public void testSavedTaskHasCreationDate() { public void testSavedTaskHasCreationDate() {
freezeClock().thawAfter(new Snippet() {{ freezeClock().thawAfter(new Snippet() {{
Task task = new Task(); Task task = new Task();
taskService.save(task); taskDao.save(task);
assertEquals(currentTimeMillis(), (long) task.getCreationDate()); assertEquals(currentTimeMillis(), (long) task.getCreationDate());
}}); }});
} }
@ -47,9 +47,9 @@ public class TaskTest extends InjectingTestCase {
@Test @Test
public void testReadTaskFromDb() { public void testReadTaskFromDb() {
Task task = new Task(); Task task = new Task();
taskService.save(task); taskDao.save(task);
Property[] properties = asQueryProperties(Task.TABLE, task.getDatabaseValues()); Property[] properties = asQueryProperties(Task.TABLE, task.getDatabaseValues());
final Task fromDb = taskService.fetchById(task.getId(), properties); final Task fromDb = taskDao.fetch(task.getId(), properties);
compareRemoteModel(task, fromDb); compareRemoteModel(task, fromDb);
} }

@ -2,10 +2,10 @@ package com.todoroo.astrid.subtasks;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.core.BuiltInFilterExposer; import com.todoroo.astrid.core.BuiltInFilterExposer;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskListMetadataDao; import com.todoroo.astrid.dao.TaskListMetadataDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.TaskListMetadata;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.subtasks.AstridOrderedListUpdater.Node; import com.todoroo.astrid.subtasks.AstridOrderedListUpdater.Node;
import com.todoroo.astrid.test.DatabaseTestCase; import com.todoroo.astrid.test.DatabaseTestCase;
@ -26,7 +26,7 @@ import static junit.framework.Assert.assertNotNull;
public class SubtasksTestCase extends DatabaseTestCase { public class SubtasksTestCase extends DatabaseTestCase {
@Inject TaskListMetadataDao taskListMetadataDao; @Inject TaskListMetadataDao taskListMetadataDao;
@Inject TaskService taskService; @Inject TaskDao taskDao;
@Inject Preferences preferences; @Inject Preferences preferences;
protected SubtasksUpdater<TaskListMetadata> updater; protected SubtasksUpdater<TaskListMetadata> updater;
@ -48,7 +48,7 @@ public class SubtasksTestCase extends DatabaseTestCase {
super.setUp(); super.setUp();
filter = BuiltInFilterExposer.getMyTasksFilter(getTargetContext().getResources()); filter = BuiltInFilterExposer.getMyTasksFilter(getTargetContext().getResources());
preferences.clear(SubtasksUpdater.ACTIVE_TASKS_ORDER); preferences.clear(SubtasksUpdater.ACTIVE_TASKS_ORDER);
updater = new SubtasksFilterUpdater(taskListMetadataDao, taskService); updater = new SubtasksFilterUpdater(taskListMetadataDao, taskDao);
} }
@Override @Override

@ -9,9 +9,9 @@ import android.support.test.runner.AndroidJUnit4;
import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.test.DatabaseTestCase; import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.Test; import org.junit.Test;
@ -33,8 +33,8 @@ public class GtasksIndentActionTest extends DatabaseTestCase {
@Inject GtasksListService gtasksListService; @Inject GtasksListService gtasksListService;
@Inject GtasksTaskListUpdater gtasksTaskListUpdater; @Inject GtasksTaskListUpdater gtasksTaskListUpdater;
@Inject MetadataDao metadataDao; @Inject MetadataDao metadataDao;
@Inject TaskService taskService;
@Inject GtasksMetadata gtasksMetadata; @Inject GtasksMetadata gtasksMetadata;
@Inject TaskDao taskDao;
private Task task; private Task task;
private GtasksList storeList; private GtasksList storeList;
@ -175,7 +175,7 @@ public class GtasksIndentActionTest extends DatabaseTestCase {
private Task taskWithMetadata(long order, int indentation) { private Task taskWithMetadata(long order, int indentation) {
Task newTask = new Task(); Task newTask = new Task();
taskService.save(newTask); taskDao.save(newTask);
Metadata metadata = gtasksMetadata.createEmptyMetadata(newTask.getId()); Metadata metadata = gtasksMetadata.createEmptyMetadata(newTask.getId());
metadata.setValue(GtasksMetadata.INDENT, indentation); metadata.setValue(GtasksMetadata.INDENT, indentation);
metadata.setValue(GtasksMetadata.ORDER, order); metadata.setValue(GtasksMetadata.ORDER, order);
@ -203,7 +203,7 @@ public class GtasksIndentActionTest extends DatabaseTestCase {
private Task taskWithoutMetadata() { private Task taskWithoutMetadata() {
Task task = new Task(); Task task = new Task();
taskService.save(task); taskDao.save(task);
return task; return task;
} }
} }

@ -9,9 +9,9 @@ import android.content.Context;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.test.DatabaseTestCase; import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.Test; import org.junit.Test;
@ -59,8 +59,8 @@ public class GtasksMetadataServiceTest extends DatabaseTestCase {
@Inject GtasksTestPreferenceService preferences; @Inject GtasksTestPreferenceService preferences;
@Inject MetadataDao metadataDao; @Inject MetadataDao metadataDao;
@Inject TaskService taskService;
@Inject GtasksMetadata gtasksMetadata; @Inject GtasksMetadata gtasksMetadata;
@Inject TaskDao taskDao;
private Task task; private Task task;
private Metadata metadata; private Metadata metadata;
@ -116,7 +116,7 @@ public class GtasksMetadataServiceTest extends DatabaseTestCase {
private Task taskWithMetadata(String id) { private Task taskWithMetadata(String id) {
Task task = new Task(); Task task = new Task();
task.setTitle("cats"); task.setTitle("cats");
taskService.save(task); taskDao.save(task);
Metadata metadata = gtasksMetadata.createEmptyMetadata(task.getId()); Metadata metadata = gtasksMetadata.createEmptyMetadata(task.getId());
if (id != null) if (id != null)
metadata.setValue(GtasksMetadata.ID, id); metadata.setValue(GtasksMetadata.ID, id);
@ -132,7 +132,7 @@ public class GtasksMetadataServiceTest extends DatabaseTestCase {
private Task taskWithoutMetadata() { private Task taskWithoutMetadata() {
Task task = new Task(); Task task = new Task();
task.setTitle("dogs"); task.setTitle("dogs");
taskService.save(task); taskDao.save(task);
return task; return task;
} }
} }

@ -9,9 +9,9 @@ import android.support.test.runner.AndroidJUnit4;
import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.test.DatabaseTestCase; import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.Ignore; import org.junit.Ignore;
@ -36,7 +36,7 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
@Inject GtasksTaskListUpdater gtasksTaskListUpdater; @Inject GtasksTaskListUpdater gtasksTaskListUpdater;
@Inject GtasksListService gtasksListService; @Inject GtasksListService gtasksListService;
@Inject MetadataDao metadataDao; @Inject MetadataDao metadataDao;
@Inject TaskService taskService; @Inject TaskDao taskDao;
@Inject GtasksMetadata gtasksMetadata; @Inject GtasksMetadata gtasksMetadata;
@Test @Test
@ -184,7 +184,7 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
private Task createTask(String title, long order, int indent) { private Task createTask(String title, long order, int indent) {
Task task = new Task(); Task task = new Task();
task.setTitle(title); task.setTitle(title);
taskService.save(task); taskDao.save(task);
Metadata metadata = gtasksMetadata.createEmptyMetadata(task.getId()); Metadata metadata = gtasksMetadata.createEmptyMetadata(task.getId());
metadata.setValue(GtasksMetadata.LIST_ID, "1"); metadata.setValue(GtasksMetadata.LIST_ID, "1");
if(order != VALUE_UNSET) if(order != VALUE_UNSET)

@ -9,9 +9,9 @@ import android.support.test.runner.AndroidJUnit4;
import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.test.DatabaseTestCase; import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.Test; import org.junit.Test;
@ -35,7 +35,7 @@ public class GtasksTaskMovingTest extends DatabaseTestCase {
@Inject GtasksListService gtasksListService; @Inject GtasksListService gtasksListService;
@Inject GtasksTaskListUpdater gtasksTaskListUpdater; @Inject GtasksTaskListUpdater gtasksTaskListUpdater;
@Inject MetadataDao metadataDao; @Inject MetadataDao metadataDao;
@Inject TaskService taskService; @Inject TaskDao taskDao;
@Inject GtasksMetadata gtasksMetadata; @Inject GtasksMetadata gtasksMetadata;
private Task A, B, C, D, E, F; private Task A, B, C, D, E, F;
@ -300,7 +300,7 @@ public class GtasksTaskMovingTest extends DatabaseTestCase {
private Task createTask(String title, long order, int indent) { private Task createTask(String title, long order, int indent) {
Task task = new Task(); Task task = new Task();
task.setTitle(title); task.setTitle(title);
taskService.save(task); taskDao.save(task);
Metadata metadata = gtasksMetadata.createEmptyMetadata(task.getId()); Metadata metadata = gtasksMetadata.createEmptyMetadata(task.getId());
metadata.setValue(GtasksMetadata.LIST_ID, "1"); metadata.setValue(GtasksMetadata.LIST_ID, "1");
if(order != VALUE_UNSET) if(order != VALUE_UNSET)

@ -15,10 +15,10 @@ import com.todoroo.astrid.adapter.TaskAdapter;
import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.api.GtasksFilter;
import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskAttachmentDao; import com.todoroo.astrid.dao.TaskAttachmentDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.data.StoreObject;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.SyncV2Service; import com.todoroo.astrid.service.SyncV2Service;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.subtasks.OrderedListFragmentHelperInterface; import com.todoroo.astrid.subtasks.OrderedListFragmentHelperInterface;
import com.todoroo.astrid.subtasks.SubtasksListFragment; import com.todoroo.astrid.subtasks.SubtasksListFragment;
import com.todoroo.astrid.sync.SyncResultCallback; import com.todoroo.astrid.sync.SyncResultCallback;
@ -47,7 +47,7 @@ public class GtasksListFragment extends SubtasksListFragment {
private static final String EXTRA_STORE_OBJECT = "extra_store_object"; private static final String EXTRA_STORE_OBJECT = "extra_store_object";
@Inject TaskService taskService; @Inject TaskDao taskDao;
@Inject MetadataDao metadataDao; @Inject MetadataDao metadataDao;
@Inject GtasksTaskListUpdater gtasksTaskListUpdater; @Inject GtasksTaskListUpdater gtasksTaskListUpdater;
@Inject GtasksPreferenceService gtasksPreferenceService; @Inject GtasksPreferenceService gtasksPreferenceService;
@ -64,7 +64,7 @@ public class GtasksListFragment extends SubtasksListFragment {
@Override @Override
protected OrderedListFragmentHelperInterface createFragmentHelper() { protected OrderedListFragmentHelperInterface createFragmentHelper() {
return new OrderedMetadataListFragmentHelper<>(preferences, taskAttachmentDao, taskService, return new OrderedMetadataListFragmentHelper<>(preferences, taskAttachmentDao, taskDao,
metadataDao, this, gtasksTaskListUpdater, dialogBuilder, checkBoxes, tagService, themeCache); metadataDao, this, gtasksTaskListUpdater, dialogBuilder, checkBoxes, tagService, themeCache);
} }

@ -24,9 +24,9 @@ import com.todoroo.astrid.adapter.TaskAdapter;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskAttachmentDao; import com.todoroo.astrid.dao.TaskAttachmentDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.subtasks.OrderedListFragmentHelperInterface; import com.todoroo.astrid.subtasks.OrderedListFragmentHelperInterface;
import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagService;
import com.todoroo.astrid.ui.DraggableListView; import com.todoroo.astrid.ui.DraggableListView;
@ -57,7 +57,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
private final Preferences preferences; private final Preferences preferences;
private final TaskAttachmentDao taskAttachmentDao; private final TaskAttachmentDao taskAttachmentDao;
private final TaskService taskService; private final TaskDao taskDao;
private final MetadataDao metadataDao; private final MetadataDao metadataDao;
private DraggableTaskAdapter taskAdapter; private DraggableTaskAdapter taskAdapter;
@ -65,13 +65,13 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
private LIST list; private LIST list;
public OrderedMetadataListFragmentHelper(Preferences preferences, TaskAttachmentDao taskAttachmentDao, public OrderedMetadataListFragmentHelper(Preferences preferences, TaskAttachmentDao taskAttachmentDao,
TaskService taskService, MetadataDao metadataDao, TaskDao taskDao, MetadataDao metadataDao,
TaskListFragment fragment, OrderedMetadataListUpdater<LIST> updater, TaskListFragment fragment, OrderedMetadataListUpdater<LIST> updater,
DialogBuilder dialogBuilder, CheckBoxes checkBoxes, TagService tagService, DialogBuilder dialogBuilder, CheckBoxes checkBoxes, TagService tagService,
ThemeCache themeCache) { ThemeCache themeCache) {
this.preferences = preferences; this.preferences = preferences;
this.taskAttachmentDao = taskAttachmentDao; this.taskAttachmentDao = taskAttachmentDao;
this.taskService = taskService; this.taskDao = taskDao;
this.metadataDao = metadataDao; this.metadataDao = metadataDao;
this.fragment = fragment; this.fragment = fragment;
this.updater = updater; this.updater = updater;
@ -196,7 +196,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
private DraggableTaskAdapter(Context context, Preferences preferences, TaskListFragment activity, private DraggableTaskAdapter(Context context, Preferences preferences, TaskListFragment activity,
Cursor c, AtomicReference<String> query, DialogBuilder dialogBuilder, Cursor c, AtomicReference<String> query, DialogBuilder dialogBuilder,
CheckBoxes checkBoxes, TagService tagService, ThemeCache themeCache) { CheckBoxes checkBoxes, TagService tagService, ThemeCache themeCache) {
super(context, preferences, taskAttachmentDao, taskService, activity, c, query, super(context, preferences, taskAttachmentDao, taskDao, activity, c, query,
dialogBuilder, checkBoxes, tagService, themeCache); dialogBuilder, checkBoxes, tagService, themeCache);
} }
@ -225,7 +225,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
for(Long taskId : chained) { for(Long taskId : chained) {
model.setId(taskId); model.setId(taskId);
model.setCompletionDate(completionDate); model.setCompletionDate(completionDate);
taskService.save(model); taskDao.save(model);
model.clear(); model.clear();
} }
taskAdapter.notifyDataSetInvalidated(); taskAdapter.notifyDataSetInvalidated();
@ -236,7 +236,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
final ArrayList<Long> chained = new ArrayList<>(); final ArrayList<Long> chained = new ArrayList<>();
final int parentIndent = item.getValue(updater.indentProperty()); final int parentIndent = item.getValue(updater.indentProperty());
updater.applyToChildren(list, itemId, node -> { updater.applyToChildren(list, itemId, node -> {
Task childTask = taskService.fetchById(node.taskId, Task.RECURRENCE); Task childTask = taskDao.fetch(node.taskId, Task.RECURRENCE);
if(!TextUtils.isEmpty(childTask.getRecurrence())) { if(!TextUtils.isEmpty(childTask.getRecurrence())) {
Metadata metadata = updater.getTaskMetadata(node.taskId); Metadata metadata = updater.getTaskMetadata(node.taskId);
metadata.setValue(updater.indentProperty(), parentIndent); metadata.setValue(updater.indentProperty(), parentIndent);
@ -245,7 +245,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
model.setId(node.taskId); model.setId(node.taskId);
model.setCompletionDate(completionDate); model.setCompletionDate(completionDate);
taskService.save(model); taskDao.save(model);
model.clear(); model.clear();
chained.add(node.taskId); chained.add(node.taskId);

@ -6,9 +6,9 @@ package com.todoroo.astrid.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskCreator; import com.todoroo.astrid.service.TaskCreator;
import com.todoroo.astrid.service.TaskService;
import org.tasks.injection.ActivityComponent; import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingAppCompatActivity; import org.tasks.injection.InjectingAppCompatActivity;
@ -24,8 +24,8 @@ import static org.tasks.intents.TaskIntents.getEditTaskStack;
*/ */
public final class ShareLinkActivity extends InjectingAppCompatActivity { public final class ShareLinkActivity extends InjectingAppCompatActivity {
@Inject TaskService taskService;
@Inject TaskCreator taskCreator; @Inject TaskCreator taskCreator;
@Inject TaskDao taskDao;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -58,7 +58,7 @@ public final class ShareLinkActivity extends InjectingAppCompatActivity {
Task task = taskCreator.basicQuickAddTask(subject); Task task = taskCreator.basicQuickAddTask(subject);
if (task != null) { if (task != null) {
task.setNotes(intent.getStringExtra(Intent.EXTRA_TEXT)); task.setNotes(intent.getStringExtra(Intent.EXTRA_TEXT));
taskService.save(task); taskDao.save(task);
getEditTaskStack(this, null, task.getId()).startActivities(); getEditTaskStack(this, null, task.getId()).startActivities();
} }
finish(); finish();

@ -43,13 +43,13 @@ import com.todoroo.astrid.api.CustomFilter;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.core.BuiltInFilterExposer; import com.todoroo.astrid.core.BuiltInFilterExposer;
import com.todoroo.astrid.dao.TaskAttachmentDao; import com.todoroo.astrid.dao.TaskAttachmentDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gtasks.GtasksListFragment; import com.todoroo.astrid.gtasks.GtasksListFragment;
import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.gtasks.GtasksPreferenceService;
import com.todoroo.astrid.service.TaskCreator; import com.todoroo.astrid.service.TaskCreator;
import com.todoroo.astrid.service.TaskDeleter; import com.todoroo.astrid.service.TaskDeleter;
import com.todoroo.astrid.service.TaskDuplicator; import com.todoroo.astrid.service.TaskDuplicator;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.subtasks.SubtasksListFragment; import com.todoroo.astrid.subtasks.SubtasksListFragment;
import com.todoroo.astrid.subtasks.SubtasksTagListFragment; import com.todoroo.astrid.subtasks.SubtasksTagListFragment;
import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagService;
@ -117,7 +117,6 @@ public class TaskListFragment extends InjectingListFragment implements
// --- instance variables // --- instance variables
@Inject SyncAdapterHelper syncAdapterHelper; @Inject SyncAdapterHelper syncAdapterHelper;
@Inject TaskService taskService;
@Inject TaskDeleter taskDeleter; @Inject TaskDeleter taskDeleter;
@Inject TaskDuplicator taskDuplicator; @Inject TaskDuplicator taskDuplicator;
@Inject @ForActivity Context context; @Inject @ForActivity Context context;
@ -134,6 +133,7 @@ public class TaskListFragment extends InjectingListFragment implements
@Inject ThemeCache themeCache; @Inject ThemeCache themeCache;
@Inject protected TaskListDataProvider taskListDataProvider; @Inject protected TaskListDataProvider taskListDataProvider;
@Inject TimerPlugin timerPlugin; @Inject TimerPlugin timerPlugin;
@Inject TaskDao taskDao;
@BindView(R.id.swipe_layout) SwipeRefreshLayout swipeRefreshLayout; @BindView(R.id.swipe_layout) SwipeRefreshLayout swipeRefreshLayout;
@BindView(R.id.swipe_layout_empty) SwipeRefreshLayout emptyView; @BindView(R.id.swipe_layout_empty) SwipeRefreshLayout emptyView;
@ -383,7 +383,7 @@ public class TaskListFragment extends InjectingListFragment implements
int importance = event.getNumber() - '1'; int importance = event.getNumber() - '1';
Task task = ((ViewHolder) selected.getTag()).task; Task task = ((ViewHolder) selected.getTag()).task;
task.setImportance(importance); task.setImportance(importance);
taskService.save(task); taskDao.save(task);
taskAdapter.setFieldContentsAndVisibility(selected); taskAdapter.setFieldContentsAndVisibility(selected);
} }
// filter // filter
@ -512,7 +512,7 @@ public class TaskListFragment extends InjectingListFragment implements
protected TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor) { protected TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor) {
return new TaskAdapter(context, preferences, taskAttachmentDao, taskService, this, cursor, return new TaskAdapter(context, preferences, taskAttachmentDao, taskDao, this, cursor,
taskListDataProvider.getSqlQueryTemplate(), dialogBuilder, checkBoxes, tagService, themeCache); taskListDataProvider.getSqlQueryTemplate(), dialogBuilder, checkBoxes, tagService, themeCache);
} }
@ -660,7 +660,7 @@ public class TaskListFragment extends InjectingListFragment implements
return true; return true;
case CONTEXT_MENU_DELETE_TASK_ID: { case CONTEXT_MENU_DELETE_TASK_ID: {
itemId = item.getGroupId(); itemId = item.getGroupId();
Task task = taskService.fetchById(itemId, Task.ID, Task.TITLE, Task.UUID); Task task = taskDao.fetch(itemId, Task.ID, Task.TITLE, Task.UUID);
if (task != null) { if (task != null) {
deleteTask(task); deleteTask(task);
} }
@ -671,7 +671,7 @@ public class TaskListFragment extends InjectingListFragment implements
Task task = new Task(); Task task = new Task();
task.setId(itemId); task.setId(itemId);
task.setDeletionDate(0L); task.setDeletionDate(0L);
taskService.save(task); taskDao.save(task);
loadTaskListContent(); loadTaskListContent();
return true; return true;
} }

@ -42,13 +42,13 @@ import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.TaskAction; import com.todoroo.astrid.api.TaskAction;
import com.todoroo.astrid.core.LinkActionExposer; import com.todoroo.astrid.core.LinkActionExposer;
import com.todoroo.astrid.dao.TaskAttachmentDao; import com.todoroo.astrid.dao.TaskAttachmentDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskAttachment;
import com.todoroo.astrid.files.FilesAction; import com.todoroo.astrid.files.FilesAction;
import com.todoroo.astrid.notes.NotesAction; import com.todoroo.astrid.notes.NotesAction;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagService;
import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.tags.TaskToTagMetadata;
import com.todoroo.astrid.ui.CheckableImageView; import com.todoroo.astrid.ui.CheckableImageView;
@ -118,7 +118,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
private final CheckBoxes checkBoxes; private final CheckBoxes checkBoxes;
private final Preferences preferences; private final Preferences preferences;
private final TaskAttachmentDao taskAttachmentDao; private final TaskAttachmentDao taskAttachmentDao;
private final TaskService taskService; private final TaskDao taskDao;
private final Context context; private final Context context;
private final TaskListFragment fragment; private final TaskListFragment fragment;
@ -145,14 +145,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
private final int textColorOverdue; private final int textColorOverdue;
public TaskAdapter(Context context, Preferences preferences, TaskAttachmentDao taskAttachmentDao, public TaskAdapter(Context context, Preferences preferences, TaskAttachmentDao taskAttachmentDao,
TaskService taskService, TaskListFragment fragment, Cursor c, TaskDao taskDao, TaskListFragment fragment, Cursor c,
AtomicReference<String> query, DialogBuilder dialogBuilder, AtomicReference<String> query, DialogBuilder dialogBuilder,
CheckBoxes checkBoxes, TagService tagService, ThemeCache themeCache) { CheckBoxes checkBoxes, TagService tagService, ThemeCache themeCache) {
super(context, c, false); super(context, c, false);
this.checkBoxes = checkBoxes; this.checkBoxes = checkBoxes;
this.preferences = preferences; this.preferences = preferences;
this.taskAttachmentDao = taskAttachmentDao; this.taskAttachmentDao = taskAttachmentDao;
this.taskService = taskService; this.taskDao = taskDao;
this.context = context; this.context = context;
this.query = query; this.query = query;
this.fragment = fragment; this.fragment = fragment;
@ -203,7 +203,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
return getFilterQueryProvider().runQuery(constraint); return getFilterQueryProvider().runQuery(constraint);
} }
return taskService.fetchFiltered(query.get(), constraint, fragment.taskProperties()); return taskDao.fetchFiltered(query.get(), constraint, fragment.taskProperties());
} }
/* ====================================================================== /* ======================================================================
@ -394,7 +394,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
private void showEditNotesDialog(final Task task) { private void showEditNotesDialog(final Task task) {
String notes = null; String notes = null;
Task t = taskService.fetchById(task.getId(), Task.NOTES); Task t = taskDao.fetch(task.getId(), Task.NOTES);
if (t != null) { if (t != null) {
notes = t.getNotes(); notes = t.getNotes();
} }
@ -616,7 +616,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
onCompletedTaskListener.onCompletedTask(task, newState); onCompletedTaskListener.onCompletedTask(task, newState);
} }
taskService.setComplete(task, newState); taskDao.setComplete(task, newState);
} }
} }

@ -27,7 +27,6 @@ import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.tags.TaskToTagMetadata;
import org.tasks.R; import org.tasks.R;
@ -48,7 +47,6 @@ public class TasksXmlImporter {
private final TagDataDao tagDataDao; private final TagDataDao tagDataDao;
private final MetadataDao metadataDao; private final MetadataDao metadataDao;
private final TaskService taskService;
private final DialogBuilder dialogBuilder; private final DialogBuilder dialogBuilder;
private final TaskDao taskDao; private final TaskDao taskDao;
@ -66,11 +64,10 @@ public class TasksXmlImporter {
} }
@Inject @Inject
public TasksXmlImporter(TagDataDao tagDataDao, MetadataDao metadataDao, TaskService taskService, public TasksXmlImporter(TagDataDao tagDataDao, MetadataDao metadataDao,
DialogBuilder dialogBuilder, TaskDao taskDao) { DialogBuilder dialogBuilder, TaskDao taskDao) {
this.tagDataDao = tagDataDao; this.tagDataDao = tagDataDao;
this.metadataDao = metadataDao; this.metadataDao = metadataDao;
this.taskService = taskService;
this.dialogBuilder = dialogBuilder; this.dialogBuilder = dialogBuilder;
this.taskDao = taskDao; this.taskDao = taskDao;
} }
@ -224,7 +221,7 @@ public class TasksXmlImporter {
} }
// Save the task to the database. // Save the task to the database.
taskService.save(currentTask); taskDao.save(currentTask);
importCount++; importCount++;
} }

@ -441,5 +441,54 @@ public class TaskDao {
notificationManager.cancel(taskId); notificationManager.cancel(taskId);
geofenceService.cancelGeofences(taskId); geofenceService.cancelGeofences(taskId);
} }
/**
* Mark the given task as completed and save it.
*/
public void setComplete(Task item, boolean completed) {
if(completed) {
item.setCompletionDate(DateUtilities.now());
} else {
item.setCompletionDate(0L);
}
save(item);
}
/**
* Fetch tasks for the given filter
* @param constraint text constraint, or null
*/
public TodorooCursor<Task> fetchFiltered(String queryTemplate, CharSequence constraint,
Property<?>... properties) {
Criterion whereConstraint = null;
if(constraint != null) {
whereConstraint = Functions.upper(Task.TITLE).like("%" +
constraint.toString().toUpperCase() + "%");
}
if(queryTemplate == null) {
if(whereConstraint == null) {
return query(Query.selectDistinct(properties));
} else {
return query(Query.selectDistinct(properties).where(whereConstraint));
}
}
String sql;
if(whereConstraint != null) {
if(!queryTemplate.toUpperCase().contains("WHERE")) {
sql = queryTemplate + " WHERE " + whereConstraint;
} else {
sql = queryTemplate.replace("WHERE ", "WHERE " + whereConstraint + " AND ");
}
} else {
sql = queryTemplate;
}
sql = PermaSql.replacePlaceholders(sql);
return query(Query.select(properties).withQueryTemplate(sql));
}
} }

@ -23,7 +23,6 @@ import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagService;
import org.tasks.injection.ContentProviderComponent; import org.tasks.injection.ContentProviderComponent;
@ -83,7 +82,6 @@ public class Astrid2TaskProvider extends InjectingContentProvider {
private static final String TAG_SEPARATOR = "|"; private static final String TAG_SEPARATOR = "|";
@Inject Lazy<TaskService> taskService;
@Inject Lazy<TagService> tagService; @Inject Lazy<TagService> tagService;
@Inject Lazy<CheckBoxes> checkBoxes; @Inject Lazy<CheckBoxes> checkBoxes;
@Inject Lazy<TaskDao> taskDao; @Inject Lazy<TaskDao> taskDao;
@ -274,7 +272,7 @@ public class Astrid2TaskProvider extends InjectingContentProvider {
try { try {
for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
taskValues.setID(cursor.get(Task.ID)); taskValues.setID(cursor.get(Task.ID));
taskService.get().save(taskValues); taskDao.get().save(taskValues);
} }
return cursor.getCount(); return cursor.getCount();
} finally { } finally {

@ -18,9 +18,9 @@ import com.google.ical.values.RRule;
import com.google.ical.values.WeekdayNum; import com.google.ical.values.WeekdayNum;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gcal.GCalHelper; import com.todoroo.astrid.gcal.GCalHelper;
import com.todoroo.astrid.service.TaskService;
import org.tasks.injection.BroadcastComponent; import org.tasks.injection.BroadcastComponent;
import org.tasks.injection.InjectingBroadcastReceiver; import org.tasks.injection.InjectingBroadcastReceiver;
@ -42,8 +42,8 @@ import static org.tasks.date.DateTimeUtils.newDateUtc;
public class RepeatTaskCompleteListener extends InjectingBroadcastReceiver { public class RepeatTaskCompleteListener extends InjectingBroadcastReceiver {
@Inject TaskService taskService;
@Inject GCalHelper gcalHelper; @Inject GCalHelper gcalHelper;
@Inject TaskDao taskDao;
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
@ -54,7 +54,7 @@ public class RepeatTaskCompleteListener extends InjectingBroadcastReceiver {
return; return;
} }
Task task = taskService.fetchById(taskId, Task.PROPERTIES); Task task = taskDao.fetch(taskId, Task.PROPERTIES);
if(task == null || !task.isCompleted()) { if(task == null || !task.isCompleted()) {
return; return;
} }
@ -81,7 +81,7 @@ public class RepeatTaskCompleteListener extends InjectingBroadcastReceiver {
return; return;
} }
rescheduleTask(gcalHelper, taskService, task, newDueDate); rescheduleTask(gcalHelper, taskDao, task, newDueDate);
// send a broadcast // send a broadcast
Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_EVENT_TASK_REPEATED); Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_EVENT_TASK_REPEATED);
@ -101,13 +101,13 @@ public class RepeatTaskCompleteListener extends InjectingBroadcastReceiver {
return repeatUntil > 0 && newDateTime(newDueDate).startOfDay().isAfter(newDateTime(repeatUntil).startOfDay()); return repeatUntil > 0 && newDateTime(newDueDate).startOfDay().isAfter(newDateTime(repeatUntil).startOfDay());
} }
private static void rescheduleTask(GCalHelper gcalHelper, TaskService taskService, Task task, long newDueDate) { private static void rescheduleTask(GCalHelper gcalHelper, TaskDao taskDao, Task task, long newDueDate) {
task.setReminderSnooze(0L); task.setReminderSnooze(0L);
task.setCompletionDate(0L); task.setCompletionDate(0L);
task.setDueDateAdjustingHideUntil(newDueDate); task.setDueDateAdjustingHideUntil(newDueDate);
gcalHelper.rescheduleRepeatingTask(task); gcalHelper.rescheduleRepeatingTask(task);
taskService.save(task); taskDao.save(task);
} }
/** Compute next due date */ /** Compute next due date */

@ -32,7 +32,6 @@ import timber.log.Timber;
public class TaskCreator { public class TaskCreator {
private final TaskService taskService;
private final GCalHelper gcalHelper; private final GCalHelper gcalHelper;
private final Preferences preferences; private final Preferences preferences;
private final MetadataDao metadataDao; private final MetadataDao metadataDao;
@ -41,10 +40,8 @@ public class TaskCreator {
private final TagService tagService; private final TagService tagService;
@Inject @Inject
public TaskCreator(TaskService taskService, GCalHelper gcalHelper, Preferences preferences, public TaskCreator(GCalHelper gcalHelper, Preferences preferences, MetadataDao metadataDao,
MetadataDao metadataDao, TagDataDao tagDataDao, TaskDao taskDao, TagDataDao tagDataDao, TaskDao taskDao, TagService tagService) {
TagService tagService) {
this.taskService = taskService;
this.gcalHelper = gcalHelper; this.gcalHelper = gcalHelper;
this.preferences = preferences; this.preferences = preferences;
this.metadataDao = metadataDao; this.metadataDao = metadataDao;
@ -72,7 +69,7 @@ public class TaskCreator {
Uri calendarUri = gcalHelper.createTaskEvent(task, new ContentValues()); Uri calendarUri = gcalHelper.createTaskEvent(task, new ContentValues());
task.setCalendarUri(calendarUri.toString()); task.setCalendarUri(calendarUri.toString());
task.putTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC, true); task.putTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC, true);
taskService.save(task); taskDao.save(task);
} }
} }

@ -11,13 +11,11 @@ import javax.inject.Inject;
public class TaskDeleter { public class TaskDeleter {
private final TaskService taskService;
private final GCalHelper gcalHelper; private final GCalHelper gcalHelper;
private final TaskDao taskDao; private final TaskDao taskDao;
@Inject @Inject
public TaskDeleter(TaskService taskService, GCalHelper gcalHelper, TaskDao taskDao) { public TaskDeleter(GCalHelper gcalHelper, TaskDao taskDao) {
this.taskService = taskService;
this.gcalHelper = gcalHelper; this.gcalHelper = gcalHelper;
this.taskDao = taskDao; this.taskDao = taskDao;
} }
@ -62,7 +60,7 @@ public class TaskDeleter {
item.setId(id); item.setId(id);
gcalHelper.deleteTaskEvent(item); gcalHelper.deleteTaskEvent(item);
item.setDeletionDate(DateUtilities.now()); item.setDeletionDate(DateUtilities.now());
taskService.save(item); taskDao.save(item);
} }
} }
} }

@ -2,6 +2,7 @@ package com.todoroo.astrid.service;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.SyncFlags; import com.todoroo.astrid.data.SyncFlags;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
@ -17,15 +18,15 @@ import timber.log.Timber;
public class TaskDuplicator { public class TaskDuplicator {
private final TaskService taskService;
private final GCalHelper gcalHelper; private final GCalHelper gcalHelper;
private final MetadataDao metadataDao; private final MetadataDao metadataDao;
private final TaskDao taskDao;
@Inject @Inject
public TaskDuplicator(TaskService taskService, GCalHelper gcalHelper, MetadataDao metadataDao) { public TaskDuplicator(GCalHelper gcalHelper, MetadataDao metadataDao, TaskDao taskDao) {
this.taskService = taskService;
this.gcalHelper = gcalHelper; this.gcalHelper = gcalHelper;
this.metadataDao = metadataDao; this.metadataDao = metadataDao;
this.taskDao = taskDao;
} }
/** /**
@ -33,7 +34,7 @@ public class TaskDuplicator {
* @return cloned item id * @return cloned item id
*/ */
public long duplicateTask(long itemId) { public long duplicateTask(long itemId) {
Task original = taskService.fetchById(itemId, Task.PROPERTIES); Task original = taskDao.fetch(itemId, Task.PROPERTIES);
Timber.d("Cloning %s", original); Timber.d("Cloning %s", original);
Task clone = new Task(original); Task clone = new Task(original);
clone.setCreationDate(DateUtilities.now()); clone.setCreationDate(DateUtilities.now());
@ -48,7 +49,7 @@ public class TaskDuplicator {
clone.putTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC, true); clone.putTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC, true);
} }
taskService.save(clone); taskDao.save(clone);
for (Metadata oldMetadata : metadataList) { for (Metadata oldMetadata : metadataList) {
if(!oldMetadata.containsNonNullValue(Metadata.KEY)) { if(!oldMetadata.containsNonNullValue(Metadata.KEY)) {

@ -1,103 +0,0 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.service;
import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Functions;
import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.PermaSql;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
import org.tasks.injection.ApplicationScope;
import javax.inject.Inject;
/**
* Service layer for {@link Task}-centered activities.
*
* @author Tim Su <tim@todoroo.com>
*
*/
@ApplicationScope
public class TaskService {
private final TaskDao taskDao;
@Inject
public TaskService(TaskDao taskDao) {
this.taskDao = taskDao;
}
// --- service layer
/**
* @return item, or null if it doesn't exist
*/
public Task fetchById(long id, Property<?>... properties) {
return taskDao.fetch(id, properties);
}
/**
* Mark the given task as completed and save it.
*/
public void setComplete(Task item, boolean completed) {
if(completed) {
item.setCompletionDate(DateUtilities.now());
} else {
item.setCompletionDate(0L);
}
save(item);
}
/**
* Create or save the given action item
*/
public void save(Task item) {
taskDao.save(item);
}
/**
* Fetch tasks for the given filter
* @param constraint text constraint, or null
*/
public TodorooCursor<Task> fetchFiltered(String queryTemplate, CharSequence constraint,
Property<?>... properties) {
Criterion whereConstraint = null;
if(constraint != null) {
whereConstraint = Functions.upper(Task.TITLE).like("%" +
constraint.toString().toUpperCase() + "%");
}
if(queryTemplate == null) {
if(whereConstraint == null) {
return taskDao.query(Query.selectDistinct(properties));
} else {
return taskDao.query(Query.selectDistinct(properties).where(whereConstraint));
}
}
String sql;
if(whereConstraint != null) {
if(!queryTemplate.toUpperCase().contains("WHERE")) {
sql = queryTemplate + " WHERE " + whereConstraint;
} else {
sql = queryTemplate.replace("WHERE ", "WHERE " + whereConstraint + " AND ");
}
} else {
sql = queryTemplate;
}
sql = PermaSql.replacePlaceholders(sql);
return taskDao.query(Query.select(properties).withQueryTemplate(sql));
}
}

@ -24,7 +24,6 @@ import com.todoroo.astrid.dao.TaskAttachmentDao;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagService;
import com.todoroo.astrid.ui.DraggableListView; import com.todoroo.astrid.ui.DraggableListView;
@ -52,7 +51,6 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
private final TaskListFragment fragment; private final TaskListFragment fragment;
private final Preferences preferences; private final Preferences preferences;
private final TaskAttachmentDao taskAttachmentDao; private final TaskAttachmentDao taskAttachmentDao;
private final TaskService taskService;
private final ThemeCache themeCache; private final ThemeCache themeCache;
private final TaskDao taskDao; private final TaskDao taskDao;
@ -61,13 +59,11 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
private LIST list; private LIST list;
public AstridOrderedListFragmentHelper(Preferences preferences, TaskAttachmentDao taskAttachmentDao, public AstridOrderedListFragmentHelper(Preferences preferences, TaskAttachmentDao taskAttachmentDao,
TaskService taskService, TaskListFragment fragment, TaskListFragment fragment, AstridOrderedListUpdater<LIST> updater,
AstridOrderedListUpdater<LIST> updater, DialogBuilder dialogBuilder, DialogBuilder dialogBuilder, CheckBoxes checkBoxes,
CheckBoxes checkBoxes, TagService tagService, TagService tagService, ThemeCache themeCache, TaskDao taskDao) {
ThemeCache themeCache, TaskDao taskDao) {
this.preferences = preferences; this.preferences = preferences;
this.taskAttachmentDao = taskAttachmentDao; this.taskAttachmentDao = taskAttachmentDao;
this.taskService = taskService;
this.fragment = fragment; this.fragment = fragment;
this.updater = updater; this.updater = updater;
this.dialogBuilder = dialogBuilder; this.dialogBuilder = dialogBuilder;
@ -199,7 +195,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
private DraggableTaskAdapter(Context context, Preferences preferences, TaskListFragment activity, private DraggableTaskAdapter(Context context, Preferences preferences, TaskListFragment activity,
Cursor c, AtomicReference<String> query, DialogBuilder dialogBuilder, Cursor c, AtomicReference<String> query, DialogBuilder dialogBuilder,
CheckBoxes checkBoxes, TagService tagService, ThemeCache themeCache) { CheckBoxes checkBoxes, TagService tagService, ThemeCache themeCache) {
super(context, preferences, taskAttachmentDao, taskService, activity, c, query, dialogBuilder, checkBoxes, tagService, themeCache); super(context, preferences, taskAttachmentDao, taskDao, activity, c, query, dialogBuilder, checkBoxes, tagService, themeCache);
} }
@Override @Override

@ -2,9 +2,9 @@ package com.todoroo.astrid.subtasks;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
@ -19,10 +19,10 @@ import timber.log.Timber;
public abstract class AstridOrderedListUpdater<LIST> { public abstract class AstridOrderedListUpdater<LIST> {
private final TaskService taskService; private final TaskDao taskDao;
AstridOrderedListUpdater(TaskService taskService) { AstridOrderedListUpdater(TaskDao taskDao) {
this.taskService = taskService; this.taskDao = taskDao;
idToNode = new HashMap<>(); idToNode = new HashMap<>();
} }
@ -79,7 +79,7 @@ public abstract class AstridOrderedListUpdater<LIST> {
Set<String> idsInQuery = new HashSet<>(); Set<String> idsInQuery = new HashSet<>();
String sql = filter.getSqlQuery().replaceAll("ORDER BY .*", ""); //$NON-NLS-1$//$NON-NLS-2$ String sql = filter.getSqlQuery().replaceAll("ORDER BY .*", ""); //$NON-NLS-1$//$NON-NLS-2$
sql = sql + String.format(" ORDER BY %s", Task.CREATION_DATE); //$NON-NLS-1$ sql = sql + String.format(" ORDER BY %s", Task.CREATION_DATE); //$NON-NLS-1$
TodorooCursor<Task> tasks = taskService.fetchFiltered(sql, null, Task.UUID); TodorooCursor<Task> tasks = taskDao.fetchFiltered(sql, null, Task.UUID);
try { try {
for (tasks.moveToFirst(); !tasks.isAfterLast(); tasks.moveToNext()) { for (tasks.moveToFirst(); !tasks.isAfterLast(); tasks.moveToNext()) {
String id = tasks.getString(0); String id = tasks.getString(0);

@ -2,10 +2,10 @@ package com.todoroo.astrid.subtasks;
import android.text.TextUtils; import android.text.TextUtils;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskListMetadataDao; import com.todoroo.astrid.dao.TaskListMetadataDao;
import com.todoroo.astrid.data.SyncFlags; import com.todoroo.astrid.data.SyncFlags;
import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.TaskListMetadata;
import com.todoroo.astrid.service.TaskService;
import javax.inject.Inject; import javax.inject.Inject;
@ -14,8 +14,8 @@ public class SubtasksFilterUpdater extends SubtasksUpdater<TaskListMetadata> {
private final TaskListMetadataDao taskListMetadataDao; private final TaskListMetadataDao taskListMetadataDao;
@Inject @Inject
public SubtasksFilterUpdater(TaskListMetadataDao taskListMetadataDao, TaskService taskService) { public SubtasksFilterUpdater(TaskListMetadataDao taskListMetadataDao, TaskDao taskDao) {
super(taskService); super(taskDao);
this.taskListMetadataDao = taskListMetadataDao; this.taskListMetadataDao = taskListMetadataDao;
} }

@ -23,7 +23,6 @@ import com.todoroo.astrid.dao.TaskListMetadataDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.TaskListMetadata;
import com.todoroo.astrid.gtasks.GtasksListFragment; import com.todoroo.astrid.gtasks.GtasksListFragment;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagService;
import org.tasks.R; import org.tasks.R;
@ -55,7 +54,6 @@ public class SubtasksListFragment extends TaskListFragment {
private int lastVisibleIndex = -1; private int lastVisibleIndex = -1;
@Inject TaskService taskService;
@Inject SubtasksFilterUpdater subtasksFilterUpdater; @Inject SubtasksFilterUpdater subtasksFilterUpdater;
@Inject TaskAttachmentDao taskAttachmentDao; @Inject TaskAttachmentDao taskAttachmentDao;
@Inject Preferences preferences; @Inject Preferences preferences;
@ -76,7 +74,7 @@ public class SubtasksListFragment extends TaskListFragment {
} }
protected OrderedListFragmentHelperInterface createFragmentHelper() { protected OrderedListFragmentHelperInterface createFragmentHelper() {
return new AstridOrderedListFragmentHelper<>(preferences, taskAttachmentDao, taskService, return new AstridOrderedListFragmentHelper<>(preferences, taskAttachmentDao,
this, subtasksFilterUpdater, dialogBuilder, checkBoxes, tagService, themeCache, taskDao); this, subtasksFilterUpdater, dialogBuilder, checkBoxes, tagService, themeCache, taskDao);
} }

@ -22,7 +22,6 @@ import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.TaskListMetadata;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagService;
import org.tasks.R; import org.tasks.R;
@ -45,7 +44,6 @@ public class SubtasksTagListFragment extends TagViewFragment {
return fragment; return fragment;
} }
@Inject TaskService taskService;
@Inject SubtasksFilterUpdater subtasksFilterUpdater; @Inject SubtasksFilterUpdater subtasksFilterUpdater;
@Inject TaskAttachmentDao taskAttachmentDao; @Inject TaskAttachmentDao taskAttachmentDao;
@Inject Preferences preferences; @Inject Preferences preferences;
@ -66,7 +64,7 @@ public class SubtasksTagListFragment extends TagViewFragment {
public void onAttach(Activity activity) { public void onAttach(Activity activity) {
super.onAttach(activity); super.onAttach(activity);
helper = new AstridOrderedListFragmentHelper<>(preferences, taskAttachmentDao, taskService, helper = new AstridOrderedListFragmentHelper<>(preferences, taskAttachmentDao,
this, subtasksFilterUpdater, dialogBuilder, checkBoxes, tagService, themeCache, taskDao); this, subtasksFilterUpdater, dialogBuilder, checkBoxes, tagService, themeCache, taskDao);
} }

@ -7,17 +7,17 @@ package com.todoroo.astrid.subtasks;
import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Criterion;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
public abstract class SubtasksUpdater<T> extends AstridOrderedListUpdater<T> { public abstract class SubtasksUpdater<T> extends AstridOrderedListUpdater<T> {
public static final String ACTIVE_TASKS_ORDER = "active_tasks_order"; //$NON-NLS-1$ public static final String ACTIVE_TASKS_ORDER = "active_tasks_order"; //$NON-NLS-1$
public static final String TODAY_TASKS_ORDER = "today_tasks_order"; //$NON-NLS-1$ public static final String TODAY_TASKS_ORDER = "today_tasks_order"; //$NON-NLS-1$
SubtasksUpdater(TaskService taskService) { SubtasksUpdater(TaskDao taskDao) {
super(taskService); super(taskDao);
} }
@Override @Override

@ -17,7 +17,6 @@ import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Constants;
import org.tasks.R; import org.tasks.R;
@ -35,16 +34,14 @@ public class TimerPlugin {
private final Context context; private final Context context;
private final NotificationManager notificationManager; private final NotificationManager notificationManager;
private final TaskService taskService;
private final Tracker tracker; private final Tracker tracker;
private final TaskDao taskDao; private final TaskDao taskDao;
@Inject @Inject
public TimerPlugin(@ForApplication Context context, NotificationManager notificationManager, public TimerPlugin(@ForApplication Context context, NotificationManager notificationManager,
TaskService taskService, Tracker tracker, TaskDao taskDao) { Tracker tracker, TaskDao taskDao) {
this.context = context; this.context = context;
this.notificationManager = notificationManager; this.notificationManager = notificationManager;
this.taskService = taskService;
this.tracker = tracker; this.tracker = tracker;
this.taskDao = taskDao; this.taskDao = taskDao;
} }
@ -87,7 +84,7 @@ public class TimerPlugin {
task.setElapsedSeconds(task.getElapsedSeconds() + newElapsed); task.setElapsedSeconds(task.getElapsedSeconds() + newElapsed);
} }
} }
taskService.save(task); taskDao.save(task);
// update notification // update notification
updateNotifications(); updateNotifications();

@ -17,8 +17,8 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.EditText; import android.widget.EditText;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import org.tasks.R; import org.tasks.R;
import org.tasks.injection.FragmentComponent; import org.tasks.injection.FragmentComponent;
@ -46,7 +46,7 @@ public class EditTitleControlSet extends TaskEditControlFragment {
private static final String EXTRA_REPEATING = "extra_repeating"; private static final String EXTRA_REPEATING = "extra_repeating";
private static final String EXTRA_PRIORITY = "extra_priority"; private static final String EXTRA_PRIORITY = "extra_priority";
@Inject TaskService taskService; @Inject TaskDao taskDao;
@Inject CheckBoxes checkBoxes; @Inject CheckBoxes checkBoxes;
@BindView(R.id.title) EditText editText; @BindView(R.id.title) EditText editText;
@ -179,7 +179,7 @@ public class EditTitleControlSet extends TaskEditControlFragment {
? getString(R.string.no_title) ? getString(R.string.no_title)
: title); : title);
if (isComplete != task.isCompleted()) { if (isComplete != task.isCompleted()) {
taskService.setComplete(task, isComplete); taskDao.setComplete(task, isComplete);
} }
} }
} }

@ -22,7 +22,6 @@ import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.reminders.ReminderService; import com.todoroo.astrid.reminders.ReminderService;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.voice.VoiceOutputAssistant; import com.todoroo.astrid.voice.VoiceOutputAssistant;
import org.tasks.injection.ForApplication; import org.tasks.injection.ForApplication;
@ -58,7 +57,6 @@ public class Notifier {
private final Context context; private final Context context;
private final TaskDao taskDao; private final TaskDao taskDao;
private final NotificationManager notificationManager; private final NotificationManager notificationManager;
private final TaskService taskService;
private final TelephonyManager telephonyManager; private final TelephonyManager telephonyManager;
private final AudioManager audioManager; private final AudioManager audioManager;
private final VoiceOutputAssistant voiceOutputAssistant; private final VoiceOutputAssistant voiceOutputAssistant;
@ -67,14 +65,12 @@ public class Notifier {
@Inject @Inject
public Notifier(@ForApplication Context context, TaskDao taskDao, public Notifier(@ForApplication Context context, TaskDao taskDao,
NotificationManager notificationManager, TaskService taskService, NotificationManager notificationManager, TelephonyManager telephonyManager,
TelephonyManager telephonyManager, AudioManager audioManager, AudioManager audioManager, VoiceOutputAssistant voiceOutputAssistant,
VoiceOutputAssistant voiceOutputAssistant, Preferences preferences, Preferences preferences, ThemeCache themeCache) {
ThemeCache themeCache) {
this.context = context; this.context = context;
this.taskDao = taskDao; this.taskDao = taskDao;
this.notificationManager = notificationManager; this.notificationManager = notificationManager;
this.taskService = taskService;
this.telephonyManager = telephonyManager; this.telephonyManager = telephonyManager;
this.audioManager = audioManager; this.audioManager = audioManager;
this.voiceOutputAssistant = voiceOutputAssistant; this.voiceOutputAssistant = voiceOutputAssistant;
@ -151,7 +147,7 @@ public class Notifier {
TodorooCursor<Task> taskTodorooCursor = null; TodorooCursor<Task> taskTodorooCursor = null;
int count; int count;
try { try {
taskTodorooCursor = taskService.fetchFiltered(query, null, Task.ID); taskTodorooCursor = taskDao.fetchFiltered(query, null, Task.ID);
if (taskTodorooCursor == null) { if (taskTodorooCursor == null) {
return; return;
} }

@ -10,10 +10,10 @@ import com.todoroo.andlib.sql.Join;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.TagFilter; import com.todoroo.astrid.api.TagFilter;
import com.todoroo.astrid.core.SortHelper; import com.todoroo.astrid.core.SortHelper;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskAttachment;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.tags.TaskToTagMetadata;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
@ -30,12 +30,12 @@ import static com.todoroo.astrid.activity.TaskListFragment.TAGS_METADATA_JOIN;
public class TaskListDataProvider { public class TaskListDataProvider {
private final AtomicReference<String> sqlQueryTemplate = new AtomicReference<>(); private final AtomicReference<String> sqlQueryTemplate = new AtomicReference<>();
private final TaskService taskService; private final TaskDao taskDao;
private final Preferences preferences; private final Preferences preferences;
@Inject @Inject
public TaskListDataProvider(TaskService taskService, Preferences preferences) { public TaskListDataProvider(TaskDao taskDao, Preferences preferences) {
this.taskService = taskService; this.taskDao = taskDao;
this.preferences = preferences; this.preferences = preferences;
} }
@ -78,7 +78,7 @@ public class TaskListDataProvider {
// Peform query // Peform query
try { try {
return taskService.fetchFiltered(sqlQueryTemplate.get(), null, properties); return taskDao.fetchFiltered(sqlQueryTemplate.get(), null, properties);
} catch (SQLiteException e) { } catch (SQLiteException e) {
// We don't show this error anymore--seems like this can get triggered // We don't show this error anymore--seems like this can get triggered
// by a strange bug, but there seems to not be any negative side effect. // by a strange bug, but there seems to not be any negative side effect.

@ -3,8 +3,8 @@ package org.tasks.receivers;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import org.tasks.injection.BroadcastComponent; import org.tasks.injection.BroadcastComponent;
import org.tasks.injection.InjectingBroadcastReceiver; import org.tasks.injection.InjectingBroadcastReceiver;
@ -18,7 +18,7 @@ public class CompleteTaskReceiver extends InjectingBroadcastReceiver {
public static final String TASK_ID = "id"; public static final String TASK_ID = "id";
public static final String TOGGLE_STATE = "flip_state"; public static final String TOGGLE_STATE = "flip_state";
@Inject TaskService taskService; @Inject TaskDao taskDao;
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
@ -27,9 +27,9 @@ public class CompleteTaskReceiver extends InjectingBroadcastReceiver {
long taskId = intent.getLongExtra(TASK_ID, 0); long taskId = intent.getLongExtra(TASK_ID, 0);
boolean flipState = intent.getBooleanExtra(TOGGLE_STATE, false); boolean flipState = intent.getBooleanExtra(TOGGLE_STATE, false);
Timber.i("Completing %s", taskId); Timber.i("Completing %s", taskId);
Task task = taskService.fetchById(taskId, Task.ID, Task.COMPLETION_DATE); Task task = taskDao.fetch(taskId, Task.ID, Task.COMPLETION_DATE);
if (task != null) { if (task != null) {
taskService.setComplete(task, !flipState || !task.isCompleted()); taskDao.setComplete(task, !flipState || !task.isCompleted());
} else { } else {
Timber.e("Could not find task with id %s", taskId); Timber.e("Could not find task with id %s", taskId);
} }

@ -10,8 +10,8 @@ import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import org.tasks.R; import org.tasks.R;
import org.tasks.analytics.Tracker; import org.tasks.analytics.Tracker;
@ -31,15 +31,15 @@ public class RepeatConfirmationReceiver extends BroadcastReceiver {
Task.REPEAT_UNTIL Task.REPEAT_UNTIL
}; };
private final TaskService taskService;
private final Activity activity; private final Activity activity;
private final Tracker tracker; private final Tracker tracker;
private final TaskDao taskDao;
@Inject @Inject
public RepeatConfirmationReceiver(TaskService taskService, Activity activity, Tracker tracker) { public RepeatConfirmationReceiver(Activity activity, Tracker tracker, TaskDao taskDao) {
this.taskService = taskService;
this.activity = activity; this.activity = activity;
this.tracker = tracker; this.tracker = tracker;
this.taskDao = taskDao;
} }
@Override @Override
@ -57,7 +57,7 @@ public class RepeatConfirmationReceiver extends BroadcastReceiver {
if (taskId > 0) { if (taskId > 0) {
long oldDueDate = intent.getLongExtra(AstridApiConstants.EXTRAS_OLD_DUE_DATE, 0); long oldDueDate = intent.getLongExtra(AstridApiConstants.EXTRAS_OLD_DUE_DATE, 0);
long newDueDate = intent.getLongExtra(AstridApiConstants.EXTRAS_NEW_DUE_DATE, 0); long newDueDate = intent.getLongExtra(AstridApiConstants.EXTRAS_NEW_DUE_DATE, 0);
Task task = taskService.fetchById(taskId, REPEAT_RESCHEDULED_PROPERTIES); Task task = taskDao.fetch(taskId, REPEAT_RESCHEDULED_PROPERTIES);
try { try {
showSnackbar(taskListFragment, task, oldDueDate, newDueDate); showSnackbar(taskListFragment, task, oldDueDate, newDueDate);
@ -74,7 +74,7 @@ public class RepeatConfirmationReceiver extends BroadcastReceiver {
.setAction(R.string.DLG_undo, v -> { .setAction(R.string.DLG_undo, v -> {
task.setDueDateAdjustingHideUntil(oldDueDate); task.setDueDateAdjustingHideUntil(oldDueDate);
task.setCompletionDate(0L); task.setCompletionDate(0L);
taskService.save(task); taskDao.save(task);
}) })
.show(); .show();
} }

@ -1,13 +1,13 @@
package org.tasks.reminders; package org.tasks.reminders;
import android.support.v4.app.FragmentManager;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.FragmentManager;
import android.text.TextUtils; import android.text.TextUtils;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import org.tasks.R; import org.tasks.R;
import org.tasks.injection.ActivityComponent; import org.tasks.injection.ActivityComponent;
@ -27,8 +27,8 @@ public class MissedCallActivity extends InjectingAppCompatActivity implements Mi
public static final String EXTRA_CALL_NOW = "extra_call_now"; public static final String EXTRA_CALL_NOW = "extra_call_now";
public static final String EXTRA_CALL_LATER = "extra_call_later"; public static final String EXTRA_CALL_LATER = "extra_call_later";
@Inject TaskService taskService;
@Inject NotificationManager notificationManager; @Inject NotificationManager notificationManager;
@Inject TaskDao taskDao;
private String name; private String name;
private String number; private String number;
@ -90,7 +90,7 @@ public class MissedCallActivity extends InjectingAppCompatActivity implements Mi
task.setTitle(TextUtils.isEmpty(name) task.setTitle(TextUtils.isEmpty(name)
? getString(R.string.MCA_task_title_no_name, number) ? getString(R.string.MCA_task_title_no_name, number)
: getString(R.string.MCA_task_title_name, name, number)); : getString(R.string.MCA_task_title_name, name, number));
taskService.save(task); taskDao.save(task);
TaskIntents TaskIntents
.getEditTaskStack(this, null, task.getId()) .getEditTaskStack(this, null, task.getId())
.startActivities(); .startActivities();

@ -5,8 +5,8 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import org.tasks.activities.DateAndTimePickerActivity; import org.tasks.activities.DateAndTimePickerActivity;
import org.tasks.activities.TimePickerActivity; import org.tasks.activities.TimePickerActivity;
@ -26,8 +26,8 @@ public class SnoozeActivity extends InjectingAppCompatActivity implements Snooze
public static final String EXTRA_TASK_ID = "id"; public static final String EXTRA_TASK_ID = "id";
public static final String EXTRA_SNOOZE_TIME = "snooze_time"; public static final String EXTRA_SNOOZE_TIME = "snooze_time";
@Inject TaskService taskService;
@Inject NotificationManager notificationManager; @Inject NotificationManager notificationManager;
@Inject TaskDao taskDao;
private long taskId; private long taskId;
private boolean pickingDateTime; private boolean pickingDateTime;
@ -80,7 +80,7 @@ public class SnoozeActivity extends InjectingAppCompatActivity implements Snooze
Task task = new Task(); Task task = new Task();
task.setId(taskId); task.setId(taskId);
task.setReminderSnooze(time.getMillis()); task.setReminderSnooze(time.getMillis());
taskService.save(task); taskDao.save(task);
notificationManager.cancel(taskId); notificationManager.cancel(taskId);
setResult(RESULT_OK); setResult(RESULT_OK);
finish(); finish();

@ -16,8 +16,8 @@ import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.core.SortHelper; import com.todoroo.astrid.core.SortHelper;
import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.subtasks.SubtasksHelper; import com.todoroo.astrid.subtasks.SubtasksHelper;
import org.tasks.BuildConfig; import org.tasks.BuildConfig;
@ -40,7 +40,7 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory {
private final ThemeCache themeCache; private final ThemeCache themeCache;
private final int widgetId; private final int widgetId;
private final Database database; private final Database database;
private final TaskService taskService; private final TaskDao taskDao;
private final DefaultFilterProvider defaultFilterProvider; private final DefaultFilterProvider defaultFilterProvider;
private final SubtasksHelper subtasksHelper; private final SubtasksHelper subtasksHelper;
private final Preferences preferences; private final Preferences preferences;
@ -62,7 +62,7 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory {
Context context, Context context,
int widgetId, int widgetId,
Database database, Database database,
TaskService taskService, TaskDao taskDao,
DefaultFilterProvider defaultFilterProvider, DefaultFilterProvider defaultFilterProvider,
WidgetCheckBoxes checkBoxes, WidgetCheckBoxes checkBoxes,
ThemeCache themeCache) { ThemeCache themeCache) {
@ -71,7 +71,7 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory {
this.context = context; this.context = context;
this.widgetId = widgetId; this.widgetId = widgetId;
this.database = database; this.database = database;
this.taskService = taskService; this.taskDao = taskDao;
this.defaultFilterProvider = defaultFilterProvider; this.defaultFilterProvider = defaultFilterProvider;
this.checkBoxes = checkBoxes; this.checkBoxes = checkBoxes;
this.themeCache = themeCache; this.themeCache = themeCache;
@ -200,7 +200,7 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory {
private TodorooCursor<Task> getCursor() { private TodorooCursor<Task> getCursor() {
String query = getQuery(); String query = getQuery();
return taskService.fetchFiltered(query, null, Task.ID, Task.TITLE, Task.DUE_DATE, Task.COMPLETION_DATE, Task.IMPORTANCE, Task.RECURRENCE); return taskDao.fetchFiltered(query, null, Task.ID, Task.TITLE, Task.DUE_DATE, Task.COMPLETION_DATE, Task.IMPORTANCE, Task.RECURRENCE);
} }
private Task getTask(int position) { private Task getTask(int position) {

@ -6,7 +6,7 @@ import android.os.Bundle;
import android.widget.RemoteViewsService; import android.widget.RemoteViewsService;
import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.subtasks.SubtasksHelper; import com.todoroo.astrid.subtasks.SubtasksHelper;
import org.tasks.injection.InjectingApplication; import org.tasks.injection.InjectingApplication;
@ -21,7 +21,7 @@ import javax.inject.Inject;
public class ScrollableWidgetUpdateService extends RemoteViewsService { public class ScrollableWidgetUpdateService extends RemoteViewsService {
@Inject Database database; @Inject Database database;
@Inject TaskService taskService; @Inject TaskDao taskDao;
@Inject Preferences preferences; @Inject Preferences preferences;
@Inject SubtasksHelper subtasksHelper; @Inject SubtasksHelper subtasksHelper;
@Inject DefaultFilterProvider defaultFilterProvider; @Inject DefaultFilterProvider defaultFilterProvider;
@ -58,6 +58,6 @@ public class ScrollableWidgetUpdateService extends RemoteViewsService {
int widgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID); int widgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID);
return new ScrollableViewsFactory(subtasksHelper, preferences, locale.createConfigurationContext(getApplicationContext()), return new ScrollableViewsFactory(subtasksHelper, preferences, locale.createConfigurationContext(getApplicationContext()),
widgetId, database, taskService, defaultFilterProvider, widgetCheckBoxes, themeCache); widgetId, database, taskDao, defaultFilterProvider, widgetCheckBoxes, themeCache);
} }
} }

Loading…
Cancel
Save