From 9275e720a61c916c9fbc1f6ebee2492bb53d739d Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 21 Oct 2016 11:59:41 -0500 Subject: [PATCH] Tighten access --- .../astrid/gtasks/GtasksTaskListUpdater.java | 29 ++++++-------- .../OrderedMetadataListFragmentHelper.java | 10 ++--- .../AstridOrderedListFragmentHelper.java | 14 +++---- .../subtasks/SubtasksFilterUpdater.java | 40 +++++++++---------- .../astrid/subtasks/SubtasksHelper.java | 6 +-- 5 files changed, 48 insertions(+), 51 deletions(-) diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java index 45623f8cb..acfb5523f 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java @@ -49,25 +49,22 @@ public class GtasksTaskListUpdater { // --- overrides - protected Metadata getTaskMetadata(long taskId) { + Metadata getTaskMetadata(long taskId) { return metadataDao.getFirstActiveByTaskAndKey(taskId, GtasksMetadata.METADATA_KEY); } - protected Metadata createEmptyMetadata(GtasksList list, long taskId) { + + private Metadata createEmptyMetadata(GtasksList list, long taskId) { Metadata metadata = GtasksMetadata.createEmptyMetadataWithoutList(taskId); metadata.setValue(GtasksMetadata.LIST_ID, list.getRemoteId()); return metadata; } - protected void beforeIndent(GtasksList list) { - updateParentSiblingMapsFor(list); - } - - protected void iterateThroughList(GtasksList list, OrderedListIterator iterator) { + private void iterateThroughList(GtasksList list, OrderedListIterator iterator) { String listId = list.getRemoteId(); gtasksSyncService.iterateThroughList(listId, iterator, 0, false); } - protected void onMovedOrIndented(Metadata metadata) { + private void onMovedOrIndented(Metadata metadata) { gtasksSyncService.triggerMoveForMetadata(metadata); } @@ -147,7 +144,7 @@ public class GtasksTaskListUpdater { return; } - beforeIndent(list); + updateParentSiblingMapsFor(list); final AtomicInteger targetTaskIndent = new AtomicInteger(-1); final AtomicInteger previousIndent = new AtomicInteger(-1); @@ -234,7 +231,7 @@ public class GtasksTaskListUpdater { * Move a task and all its children to the position right above * taskIdToMoveto. Will change the indent level to match taskIdToMoveTo. */ - public void moveTo(GtasksList list, final long targetTaskId, + void moveTo(GtasksList list, final long targetTaskId, final long moveBeforeTaskId) { if(list == null) { return; @@ -279,12 +276,12 @@ public class GtasksTaskListUpdater { return ancestorOf(ancestor, descendant.parent); } - protected static class Node { + static class Node { public final long taskId; public Node parent; - public final ArrayList children = new ArrayList<>(); + final ArrayList children = new ArrayList<>(); - public Node(long taskId, Node parent) { + Node(long taskId, Node parent) { this.taskId = taskId; this.parent = parent; } @@ -372,14 +369,14 @@ public class GtasksTaskListUpdater { // --- task cascading operations - public interface OrderedListNodeVisitor { + interface OrderedListNodeVisitor { void visitNode(Node node); } /** * Apply an operation only to the children of the task */ - public void applyToChildren(GtasksList list, long targetTaskId, + void applyToChildren(GtasksList list, long targetTaskId, OrderedListNodeVisitor visitor) { Node root = buildTreeModel(list); @@ -402,7 +399,7 @@ public class GtasksTaskListUpdater { /** * Removes a task from the order hierarchy and un-indent children */ - public void onDeleteTask(GtasksList list, final long targetTaskId) { + void onDeleteTask(GtasksList list, final long targetTaskId) { if(list == null) { return; } diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java index a86707cfa..a34d5baaf 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java @@ -44,7 +44,7 @@ import java.util.concurrent.atomic.AtomicReference; import timber.log.Timber; -public class OrderedMetadataListFragmentHelper { +class OrderedMetadataListFragmentHelper { private final DisplayMetrics metrics = new DisplayMetrics(); private final GtasksTaskListUpdater updater; @@ -63,7 +63,7 @@ public class OrderedMetadataListFragmentHelper { private GtasksList list; - public OrderedMetadataListFragmentHelper(Preferences preferences, TaskAttachmentDao taskAttachmentDao, + OrderedMetadataListFragmentHelper(Preferences preferences, TaskAttachmentDao taskAttachmentDao, TaskDao taskDao, MetadataDao metadataDao, TaskListFragment fragment, GtasksTaskListUpdater updater, DialogBuilder dialogBuilder, CheckBoxes checkBoxes, TagService tagService, @@ -94,7 +94,7 @@ public class OrderedMetadataListFragmentHelper { return (DraggableListView) fragment.getListView(); } - public void setUpUiComponents() { + void setUpUiComponents() { TypedValue tv = new TypedValue(); getActivity().getTheme().resolveAttribute(R.attr.colorAccent, tv, false); getTouchListView().setDragndropBackgroundColor(tv.data); @@ -176,7 +176,7 @@ public class OrderedMetadataListFragmentHelper { } }; - public TaskAdapter createTaskAdapter(Context context, TodorooCursor cursor, + TaskAdapter createTaskAdapter(Context context, TodorooCursor cursor, AtomicReference sqlQueryTemplate) { taskAdapter = new DraggableTaskAdapter(context, preferences, fragment, cursor, @@ -261,7 +261,7 @@ public class OrderedMetadataListFragmentHelper { // } - public void onDeleteTask(Task task) { + void onDeleteTask(Task task) { updater.onDeleteTask(list, task.getId()); taskAdapter.notifyDataSetInvalidated(); } diff --git a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index 7f2511ac2..8c3570f4f 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicReference; import timber.log.Timber; -public class AstridOrderedListFragmentHelper { +class AstridOrderedListFragmentHelper { private final DisplayMetrics metrics = new DisplayMetrics(); private final SubtasksFilterUpdater updater; @@ -59,7 +59,7 @@ public class AstridOrderedListFragmentHelper { private TaskListMetadata list; - public AstridOrderedListFragmentHelper(Preferences preferences, TaskAttachmentDao taskAttachmentDao, + AstridOrderedListFragmentHelper(Preferences preferences, TaskAttachmentDao taskAttachmentDao, TaskListFragment fragment, SubtasksFilterUpdater updater, DialogBuilder dialogBuilder, CheckBoxes checkBoxes, TagService tagService, ThemeCache themeCache, TaskDao taskDao) { @@ -88,7 +88,7 @@ public class AstridOrderedListFragmentHelper { return fragment.getFilter(); } - public void setUpUiComponents() { + void setUpUiComponents() { TypedValue tv = new TypedValue(); getActivity().getTheme().resolveAttribute(R.attr.colorAccent, tv, false); DraggableListView draggableListView = (DraggableListView) fragment.getListView(); @@ -101,7 +101,7 @@ public class AstridOrderedListFragmentHelper { draggableListView.setItemHightNormal(taskAdapter.computeFullRowHeight()); } - public void beforeSetUpTaskList(Filter filter) { + void beforeSetUpTaskList(Filter filter) { updater.initialize(list, filter); } @@ -177,7 +177,7 @@ public class AstridOrderedListFragmentHelper { } }; - public TaskAdapter createTaskAdapter(Context context, TodorooCursor cursor, + TaskAdapter createTaskAdapter(Context context, TodorooCursor cursor, AtomicReference sqlQueryTemplate) { taskAdapter = new DraggableTaskAdapter(context, preferences, fragment, cursor, @@ -268,13 +268,13 @@ public class AstridOrderedListFragmentHelper { this.list = list; } - public void onCreateTask(String uuid) { + void onCreateTask(String uuid) { updater.onCreateTask(list, getFilter(), uuid); fragment.reconstructCursor(); fragment.loadTaskListContent(); } - public void onDeleteTask(Task task) { + void onDeleteTask(Task task) { updater.onDeleteTask(list, getFilter(), task.getUuid()); taskAdapter.notifyDataSetInvalidated(); } diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java index 81333f2d4..e55ea141b 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java +++ b/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java @@ -27,8 +27,8 @@ import timber.log.Timber; public class SubtasksFilterUpdater { - 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$ + static final String ACTIVE_TASKS_ORDER = "active_tasks_order"; //$NON-NLS-1$ + static final String TODAY_TASKS_ORDER = "today_tasks_order"; //$NON-NLS-1$ private final TaskListMetadataDao taskListMetadataDao; private final TaskDao taskDao; @@ -41,7 +41,7 @@ public class SubtasksFilterUpdater { this.taskListMetadataDao = taskListMetadataDao; } - protected String getSerializedTree(TaskListMetadata list) { + private String getSerializedTree(TaskListMetadata list) { if (list == null) { return "[]"; //$NON-NLS-1$ } @@ -54,7 +54,7 @@ public class SubtasksFilterUpdater { return order; } - protected void writeSerialization(TaskListMetadata list, String serialized, boolean shouldQueueSync) { + void writeSerialization(TaskListMetadata list, String serialized, boolean shouldQueueSync) { if (list != null) { list.setTaskIDs(serialized); if (!shouldQueueSync) { @@ -69,7 +69,7 @@ public class SubtasksFilterUpdater { applyToFilter(filter); } - protected void applyToFilter(Filter filter) { + private void applyToFilter(Filter filter) { String query = filter.getSqlQuery(); query = query.replaceAll("ORDER BY .*", ""); @@ -81,24 +81,24 @@ public class SubtasksFilterUpdater { filter.setFilterQueryOverride(query); } - public interface OrderedListNodeVisitor { + interface OrderedListNodeVisitor { void visitNode(Node node); } - public static class Node { + static class Node { public String uuid; public Node parent; public int indent; - public final ArrayList children = new ArrayList<>(); + final ArrayList children = new ArrayList<>(); - public Node(String uuid, Node parent, int indent) { + Node(String uuid, Node parent, int indent) { this.uuid = uuid; this.parent = parent; this.indent = indent; } } - public int getIndentForTask(String targetTaskId) { + int getIndentForTask(String targetTaskId) { Node n = idToNode.get(targetTaskId); if (n == null) { return 0; @@ -106,7 +106,7 @@ public class SubtasksFilterUpdater { return n.indent; } - public void initializeFromSerializedTree(TaskListMetadata list, Filter filter, String serializedTree) { + void initializeFromSerializedTree(TaskListMetadata list, Filter filter, String serializedTree) { idToNode.clear(); treeRoot = buildTreeModel(serializedTree, node -> idToNode.put(node.uuid, node)); verifyTreeModel(list, filter); @@ -178,12 +178,12 @@ public class SubtasksFilterUpdater { return ids.toArray(new String[ids.size()]); } - String getOrderString() { + private String getOrderString() { String[] ids = getOrderedIds(); return buildOrderString(ids); } - public static String buildOrderString(String[] ids) { + static String buildOrderString(String[] ids) { StringBuilder builder = new StringBuilder(); if (ids.length == 0) { return "(1)"; //$NON-NLS-1$ @@ -207,7 +207,7 @@ public class SubtasksFilterUpdater { } } - public void applyToDescendants(String taskId, OrderedListNodeVisitor visitor) { + void applyToDescendants(String taskId, OrderedListNodeVisitor visitor) { Node n = idToNode.get(taskId); if (n == null) { return; @@ -289,7 +289,7 @@ public class SubtasksFilterUpdater { } } - public void moveTo(TaskListMetadata list, Filter filter, String targetTaskId, String beforeTaskId) { + void moveTo(TaskListMetadata list, Filter filter, String targetTaskId, String beforeTaskId) { Node target = idToNode.get(targetTaskId); if (target == null) { return; @@ -313,7 +313,7 @@ public class SubtasksFilterUpdater { moveHelper(list, filter, target, before); } - public void moveToParentOf(String moveThis, String toParentOfThis) { + void moveToParentOf(String moveThis, String toParentOfThis) { Node target = idToNode.get(toParentOfThis); if (target == null) { return; @@ -384,7 +384,7 @@ public class SubtasksFilterUpdater { applyToFilter(filter); } - public void onCreateTask(TaskListMetadata list, Filter filter, String uuid) { + void onCreateTask(TaskListMetadata list, Filter filter, String uuid) { if (idToNode.containsKey(uuid) || !RemoteModel.isValidUuid(uuid)) { return; } @@ -396,7 +396,7 @@ public class SubtasksFilterUpdater { applyToFilter(filter); } - public void onDeleteTask(TaskListMetadata list, Filter filter, String taskId) { + void onDeleteTask(TaskListMetadata list, Filter filter, String taskId) { Node task = idToNode.get(taskId); if (task == null) { return; @@ -425,7 +425,7 @@ public class SubtasksFilterUpdater { void afterAddNode(Node node); } - public static Node buildTreeModel(String serializedTree, JSONTreeModelBuilder callback) { + static Node buildTreeModel(String serializedTree, JSONTreeModelBuilder callback) { Node root = new Node("-1", null, -1); //$NON-NLS-1$ try { JSONArray tree = new JSONArray(serializedTree); @@ -461,7 +461,7 @@ public class SubtasksFilterUpdater { return serializeTree(treeRoot); } - public static String serializeTree(Node root) { + static String serializeTree(Node root) { JSONArray tree = new JSONArray(); if (root == null) { return tree.toString(); diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java index 793afe3fa..b3f65abf3 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java +++ b/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java @@ -111,7 +111,7 @@ public class SubtasksHelper { return ids; } - public static String[] getStringIdArray(String serializedTree) { + static String[] getStringIdArray(String serializedTree) { ArrayList ids = new ArrayList<>(); String[] values = serializedTree.split("[\\[\\],\"\\s]"); // Split on [ ] , or whitespace chars for (String idString : values) { @@ -125,7 +125,7 @@ public class SubtasksHelper { /** * Takes a subtasks string containing local ids and remaps it to one containing UUIDs */ - public static String convertTreeToRemoteIds(TaskDao taskDao, String localTree) { + static String convertTreeToRemoteIds(TaskDao taskDao, String localTree) { List localIds = getIdList(localTree); HashMap idMap = getIdMap(taskDao, localIds, Task.ID, Task.UUID); idMap.put(-1L, "-1"); //$NON-NLS-1$ @@ -135,7 +135,7 @@ public class SubtasksHelper { return SubtasksFilterUpdater.serializeTree(tree); } - public interface TreeRemapHelper { + interface TreeRemapHelper { T getKeyFromOldUuid(String uuid); }