diff --git a/api/src/main/java/com/todoroo/astrid/data/UserActivity.java b/api/src/main/java/com/todoroo/astrid/data/UserActivity.java index 426746ef4..54032b0ac 100644 --- a/api/src/main/java/com/todoroo/astrid/data/UserActivity.java +++ b/api/src/main/java/com/todoroo/astrid/data/UserActivity.java @@ -115,10 +115,6 @@ public class UserActivity extends RemoteModel { setValue(ACTION, action); } - public void setUUID(String uuid) { - setValue(UUID, uuid); - } - public void setPicture(String picture) { setValue(PICTURE, picture); } diff --git a/astrid/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java b/astrid/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java index b43085324..b34e8a5a9 100644 --- a/astrid/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java +++ b/astrid/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java @@ -320,7 +320,7 @@ abstract public class TranslationTests extends AndroidTestCase { /** * @return an array of all string resource id's */ - public int[] getResourceIds(Class resources) throws Exception { + public int[] getResourceIds(Class resources) { Field[] fields = resources.getDeclaredFields(); List ids = new ArrayList<>(fields.length); for (Field field : fields) { diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java index 63a4ddb02..dfe0408bf 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java @@ -82,7 +82,7 @@ public class MetadataDaoTests extends DatabaseTestCase { /** * Test metadata bound to task */ - public void disabled_testMetadataConditions() throws Exception { + public void disabled_testMetadataConditions() { // create "happy" Metadata metadata = new Metadata(); metadata.setKey("with1"); diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java index 6b58bd95c..aadeda7d3 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java @@ -27,7 +27,7 @@ public class TaskDaoTests extends DatabaseTestCase { /** * Test basic task creation, fetch, and save */ - public void disabled_testTaskCreation() throws Exception { + public void disabled_testTaskCreation() { TodorooCursor cursor = taskDao.query( Query.select(IDS)); assertEquals(0, cursor.getCount()); @@ -75,7 +75,7 @@ public class TaskDaoTests extends DatabaseTestCase { /** * Test various task fetch conditions */ - public void disabled_testTaskConditions() throws Exception { + public void disabled_testTaskConditions() { // create normal task Task task = new Task(); task.setTitle("normal"); @@ -133,7 +133,7 @@ public class TaskDaoTests extends DatabaseTestCase { /** * Test task deletion */ - public void disabled_testTDeletion() throws Exception { + public void disabled_testTDeletion() { TodorooCursor cursor = taskDao.query( Query.select(IDS)); assertEquals(0, cursor.getCount()); @@ -160,7 +160,7 @@ public class TaskDaoTests extends DatabaseTestCase { /** * Test save without prior create doesn't work */ - public void disabled_testSaveWithoutCreate() throws Exception { + public void disabled_testSaveWithoutCreate() { TodorooCursor cursor; // try to save task "happy" @@ -179,7 +179,7 @@ public class TaskDaoTests extends DatabaseTestCase { /** * Test passing invalid task indices to various things */ - public void disabled_testInvalidIndex() throws Exception { + public void disabled_testInvalidIndex() { TodorooCursor cursor; cursor = taskDao.query( diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java index 2b7c25534..9b04fc0cf 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java @@ -13,7 +13,7 @@ public class SubtasksMovingTest extends SubtasksTestCase { private Task A, B, C, D, E, F; // @Override - protected void disabled_setUp() throws Exception { + protected void disabled_setUp() { super.setUp(); createTasks(); TaskListMetadata m = new TaskListMetadata(); diff --git a/astrid/src/androidTest/java/org/tasks/Freeze.java b/astrid/src/androidTest/java/org/tasks/Freeze.java index 6a00ef607..2d7b240cc 100644 --- a/astrid/src/androidTest/java/org/tasks/Freeze.java +++ b/astrid/src/androidTest/java/org/tasks/Freeze.java @@ -30,7 +30,8 @@ public class Freeze { DateTimeUtils.setCurrentMillisSystem(); } - public void thawAfter(@SuppressWarnings("UnusedParameters") Snippet snippet) { + @SuppressWarnings("UnusedParameters") + public void thawAfter(Snippet snippet) { thaw(); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index def7a0f26..5200cc545 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -648,14 +648,9 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel syncActionHelper.request(); } - public static int getTaskRowResource() { - return R.layout.task_adapter_row_simple; - } - protected TaskAdapter createTaskAdapter(TodorooCursor cursor) { - return new TaskAdapter(preferences, taskAttachmentDao, taskService, this, getTaskRowResource(), - cursor, sqlQueryTemplate, + return new TaskAdapter(preferences, taskAttachmentDao, taskService, this, cursor, sqlQueryTemplate, new OnCompletedTaskListener() { @Override public void onCompletedTask(Task item, boolean newState) { diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index 99bbc503f..e936bd441 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -157,7 +157,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { protected final Resources resources; protected final HashMap completedItems = new HashMap<>(0); protected OnCompletedTaskListener onCompletedTaskListener = null; - protected final int resource; + protected final int resource = R.layout.task_adapter_row_simple; protected final LayoutInflater inflater; private int fontSize; private final ScaleAnimation scaleAnimation; @@ -172,17 +172,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { private final Map taskActionLoader = Collections.synchronizedMap(new HashMap()); - /** - * Constructor - * - * @param resource - * layout resource to inflate - * @param c - * database cursor - * @param onCompletedTaskListener - * task listener. can be null - */ - public TaskAdapter(ActivityPreferences preferences, TaskAttachmentDao taskAttachmentDao, TaskService taskService, TaskListFragment fragment, int resource, + public TaskAdapter(ActivityPreferences preferences, TaskAttachmentDao taskAttachmentDao, TaskService taskService, TaskListFragment fragment, Cursor c, AtomicReference query, OnCompletedTaskListener onCompletedTaskListener) { super(ContextManager.getContext(), c, false); this.preferences = preferences; @@ -190,7 +180,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { this.taskService = taskService; this.context = ContextManager.getContext(); this.query = query; - this.resource = resource; this.fragment = fragment; this.resources = fragment.getResources(); this.onCompletedTaskListener = onCompletedTaskListener; diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java index 41fab399b..4f58276f7 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java @@ -175,7 +175,7 @@ public class TasksXmlExporter { fos.close(); } - private void serializeTagDatas() throws IOException { + private void serializeTagDatas() { tagDataDao.allTags(new Callback() { @Override public void apply(TagData tag) { diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java index a225a6308..848a9b891 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java @@ -29,12 +29,9 @@ import javax.inject.Singleton; @Singleton public class MetadataDao extends DatabaseDao { - private final Database database; - @Inject public MetadataDao(Database database) { super(Metadata.class); - this.database = database; setDatabase(database); } diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index 14c1fcd32..c7c911609 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -171,8 +171,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen public TaskAdapter createTaskAdapter(TodorooCursor cursor, AtomicReference sqlQueryTemplate) { - taskAdapter = new DraggableTaskAdapter(preferences, fragment, TaskListFragment.getTaskRowResource(), - cursor, sqlQueryTemplate); + taskAdapter = new DraggableTaskAdapter(preferences, fragment, cursor, sqlQueryTemplate); getTouchListView().setItemHightNormal(taskAdapter.computeFullRowHeight()); @@ -188,9 +187,9 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen private final class DraggableTaskAdapter extends TaskAdapter { - private DraggableTaskAdapter(ActivityPreferences preferences, TaskListFragment activity, int resource, + private DraggableTaskAdapter(ActivityPreferences preferences, TaskListFragment activity, Cursor c, AtomicReference query) { - super(preferences, taskAttachmentDao, taskService, activity, resource, c, query, null); + super(preferences, taskAttachmentDao, taskService, activity, c, query, null); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java index 004c59264..10ec6643b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java @@ -182,8 +182,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm public TaskAdapter createTaskAdapter(TodorooCursor cursor, AtomicReference sqlQueryTemplate) { - taskAdapter = new DraggableTaskAdapter(preferences, fragment, TaskListFragment.getTaskRowResource(), - cursor, sqlQueryTemplate); + taskAdapter = new DraggableTaskAdapter(preferences, fragment, cursor, sqlQueryTemplate); taskAdapter.addOnCompletedTaskListener(new OnCompletedTaskListener() { @Override @@ -197,9 +196,9 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm private final class DraggableTaskAdapter extends TaskAdapter { - private DraggableTaskAdapter(ActivityPreferences preferences, TaskListFragment activity, int resource, + private DraggableTaskAdapter(ActivityPreferences preferences, TaskListFragment activity, Cursor c, AtomicReference query) { - super(preferences, taskAttachmentDao, taskService, activity, resource, c, query, null); + super(preferences, taskAttachmentDao, taskService, activity, c, query, null); } @Override