ActFmDataService doesn't need to exist anymore

astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmDataService.java

@@ -1,79 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.actfm.sync;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.content.Context;
-
-import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.ContextManager;
-import com.todoroo.andlib.service.DependencyInjectionService;
-import com.todoroo.andlib.sql.Criterion;
-import com.todoroo.andlib.sql.Functions;
-import com.todoroo.andlib.sql.Join;
-import com.todoroo.andlib.sql.Query;
-import com.todoroo.astrid.dao.TaskDao;
-import com.todoroo.astrid.dao.UserDao;
-import com.todoroo.astrid.data.Metadata;
-import com.todoroo.astrid.data.TagData;
-import com.todoroo.astrid.data.Task;
-import com.todoroo.astrid.service.MetadataService;
-import com.todoroo.astrid.service.TagDataService;
-import com.todoroo.astrid.tags.TagService;
-
-public final class ActFmDataService {
-
-    // --- constants
-
-    /** Utility for joining tasks with metadata */
-    public static final Join METADATA_JOIN = Join.left(Metadata.TABLE, Task.ID.eq(Metadata.TASK));
-
-    // --- instance variables
-
-    protected final Context context;
-
-    @Autowired TaskDao taskDao;
-
-    @Autowired UserDao userDao;
-
-    @Autowired MetadataService metadataService;
-
-    @Autowired ActFmPreferenceService actFmPreferenceService;
-
-    @Autowired TagDataService tagDataService;
-
-    public ActFmDataService() {
-        this.context = ContextManager.getContext();
-        DependencyInjectionService.getInstance().inject(this);
-    }
-
-    // --- task and metadata methods
-
-
-    @SuppressWarnings("nls")
-    public void saveFeaturedList(JSONObject featObject) throws JSONException {
-        TodorooCursor<TagData> cursor = tagDataService.query(Query.select(TagData.PROPERTIES).where(
-                Criterion.and(Functions.bitwiseAnd(TagData.FLAGS, TagData.FLAG_FEATURED).gt(0), TagData.UUID.eq(featObject.get("id")))));
-        try {
-            cursor.moveToNext();
-            TagData tagData = new TagData();
-            if (!cursor.isAfterLast()) {
-                tagData.readFromCursor(cursor);
-                if(!tagData.getValue(TagData.NAME).equals(featObject.getString("name")))
-                    TagService.getInstance().rename(tagData.getValue(TagData.NAME), featObject.getString("name"));
-                cursor.moveToNext();
-            }
-            ActFmSyncService.JsonHelper.featuredListFromJson(featObject, tagData);
-            tagDataService.save(tagData);
-
-        } finally {
-            cursor.close();
-        }
-    }
-}

astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java

@@ -71,7 +71,6 @@ public final class ActFmSyncService {
     @Autowired ActFmPreferenceService actFmPreferenceService;
     @Autowired GtasksPreferenceService gtasksPreferenceService;
     @Autowired ActFmInvoker actFmInvoker;
-    @Autowired ActFmDataService actFmDataService;
     @Autowired TaskDao taskDao;
     @Autowired TagDataDao tagDataDao;
     @Autowired UserDao userDao;
@@ -428,7 +427,7 @@ public final class ActFmSyncService {
 
         for (int i = 0; i < featuredLists.length(); i++) {
             JSONObject featObject = featuredLists.getJSONObject(i);
-            actFmDataService.saveFeaturedList(featObject);
+            tagDataService.saveFeaturedList(featObject);
         }
 
         return result.optInt("time", 0);

astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java

@@ -10,7 +10,6 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService.AndroidLogReporter;
 import com.todoroo.andlib.service.ExceptionService.ErrorReporter;
 import com.todoroo.andlib.service.HttpRestClient;
-import com.todoroo.astrid.actfm.sync.ActFmDataService;
 import com.todoroo.astrid.actfm.sync.ActFmInvoker;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncService;
@@ -102,7 +101,6 @@ public class AstridDependencyInjector extends AbstractDependencyInjector {
 
         // com.todoroo.astrid.sharing
         injectables.put("actFmPreferenceService", ActFmPreferenceService.class);
-        injectables.put("actFmDataService", ActFmDataService.class);
         injectables.put("actFmInvoker", ActFmInvoker.class);
         injectables.put("actFmSyncService", ActFmSyncService.class);
 

astrid/src/com/todoroo/astrid/service/TagDataService.java

@@ -5,6 +5,9 @@
  */
 package com.todoroo.astrid.service;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import android.database.Cursor;
 import android.text.TextUtils;
 
@@ -19,6 +22,7 @@ import com.todoroo.andlib.sql.Join;
 import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
+import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.actfm.sync.messages.NameMaps;
 import com.todoroo.astrid.adapter.UpdateAdapter;
 import com.todoroo.astrid.api.PermaSql;
@@ -32,6 +36,7 @@ import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.data.UserActivity;
+import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
 /**
@@ -184,6 +189,27 @@ public class TagDataService {
         return userActivityDao.query(resultQuery);
     }
 
+    @SuppressWarnings("nls")
+    public void saveFeaturedList(JSONObject featObject) throws JSONException {
+        TodorooCursor<TagData> cursor = query(Query.select(TagData.PROPERTIES).where(
+                Criterion.and(Functions.bitwiseAnd(TagData.FLAGS, TagData.FLAG_FEATURED).gt(0), TagData.UUID.eq(featObject.get("id")))));
+        try {
+            cursor.moveToNext();
+            TagData tagData = new TagData();
+            if (!cursor.isAfterLast()) {
+                tagData.readFromCursor(cursor);
+                if(!tagData.getValue(TagData.NAME).equals(featObject.getString("name")))
+                    TagService.getInstance().rename(tagData.getValue(TagData.NAME), featObject.getString("name"));
+                cursor.moveToNext();
+            }
+            ActFmSyncService.JsonHelper.featuredListFromJson(featObject, tagData);
+            save(tagData);
+
+        } finally {
+            cursor.close();
+        }
+    }
+
     /**
      * Return update
      * @param tagData

tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java

@@ -6,10 +6,8 @@
 package com.todoroo.astrid.sync.repeats;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.concurrent.Semaphore;
 
-import org.json.JSONArray;
 import org.json.JSONObject;
 
 import com.google.ical.values.Frequency;
@@ -21,13 +19,11 @@ import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.actfm.sync.ActFmDataService;
 import com.todoroo.astrid.actfm.sync.ActFmInvoker;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncV2Provider;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
-import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.sync.SyncResultCallbackAdapter;
@@ -35,7 +31,6 @@ import com.todoroo.astrid.sync.SyncResultCallbackAdapter;
 public class RepeatTestsActFmSync extends AbstractSyncRepeatTests<Task> {
 
     @Autowired MetadataService metadataService;
-    @Autowired ActFmDataService actFmDataService;
     @Autowired ActFmSyncService actFmSyncService;
     @Autowired ActFmPreferenceService actFmPreferenceService;
     protected static ActFmInvoker invoker = null;