Move OrderedMetadataListUpdater to gtasks package

astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java

@@ -32,7 +32,6 @@ import com.todoroo.astrid.service.SyncV2Service;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.subtasks.AstridOrderedListFragmentHelper;
 import com.todoroo.astrid.subtasks.OrderedListFragmentHelperInterface;
-import com.todoroo.astrid.subtasks.OrderedMetadataListFragmentHelper;
 
 import org.tasks.R;
 import org.tasks.injection.ForActivity;

astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java

@@ -22,7 +22,7 @@ import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gtasks.sync.GtasksTaskContainer;
-import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListIterator;
+import com.todoroo.astrid.gtasks.OrderedMetadataListUpdater.OrderedListIterator;
 
 import java.util.ArrayList;
 import java.util.HashSet;

astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java

@@ -19,7 +19,6 @@ import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gtasks.sync.GtasksSyncService;
-import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java

@@ -3,7 +3,7 @@
  *
  * See the file "LICENSE" for the full license governing this code.
  */
-package com.todoroo.astrid.subtasks;
+package com.todoroo.astrid.gtasks;
 
 import android.app.Activity;
 import android.database.Cursor;
@@ -28,8 +28,7 @@ import com.todoroo.astrid.dao.TaskAttachmentDao;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.TaskService;
-import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.Node;
+import com.todoroo.astrid.subtasks.OrderedListFragmentHelperInterface;
-import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListNodeVisitor;
 import com.todoroo.astrid.ui.DraggableListView;
 
 import org.slf4j.Logger;
@@ -238,9 +237,9 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
 
         final ArrayList<Long> chained = new ArrayList<>();
         final int parentIndent = item.getValue(updater.indentProperty());
-        updater.applyToChildren(list, itemId, new OrderedListNodeVisitor() {
+        updater.applyToChildren(list, itemId, new OrderedMetadataListUpdater.OrderedListNodeVisitor() {
             @Override
-            public void visitNode(Node node) {
+            public void visitNode(OrderedMetadataListUpdater.Node node) {
                 Task childTask = taskService.fetchById(node.taskId, Task.RECURRENCE);
                 if(!TextUtils.isEmpty(childTask.getRecurrence())) {
                     Metadata metadata = updater.getTaskMetadata(node.taskId);

astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java

@@ -3,7 +3,7 @@
  *
  * See the file "LICENSE" for the full license governing this code.
  */
-package com.todoroo.astrid.subtasks;
+package com.todoroo.astrid.gtasks;
 
 import com.todoroo.andlib.data.Property.IntegerProperty;
 import com.todoroo.andlib.data.Property.LongProperty;