From ddd7961d35a1f4e9d8a800b1a0ec711d980c6b61 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 25 Jan 2018 14:43:08 -0600
Subject: [PATCH] Remove deleteTasksWithEmptyTitles

---
 .../java/com/todoroo/astrid/dao/TaskDaoTests.java   |  7 -------
 .../main/java/com/todoroo/astrid/dao/TaskDao.java   |  5 -----
 .../com/todoroo/astrid/service/StartupService.java  | 13 ++++---------
 .../com/todoroo/astrid/service/TaskDeleter.java     | 12 ------------
 4 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java b/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java
index 4c670a4eb..5146a1e38 100644
--- a/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java
+++ b/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java
@@ -18,8 +18,6 @@ import org.junit.runner.RunWith;
 import org.tasks.injection.InjectingTestCase;
 import org.tasks.injection.TestComponent;
 
-import java.util.List;
-
 import javax.inject.Inject;
 
 import static junit.framework.Assert.assertEquals;
@@ -113,11 +111,6 @@ public class TaskDaoTests extends InjectingTestCase {
         task.setCompletionDate(DateUtilities.now() - 10000);
         taskDao.save(task);
 
-        // check has no name
-        List<Task> tasks = taskDao.toList(Query.select(TITLES).where(TaskCriteria.hasNoTitle()));
-        assertEquals(1, tasks.size());
-        assertEquals("", tasks.get(0).getTitle());
-
         // check is active
         assertEquals(5, taskDao.toList(Query.select(TITLES).where(TaskCriteria.isActive())).size());
 
diff --git a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
index fd8551a31..24a7a22a4 100644
--- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
+++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
@@ -143,11 +143,6 @@ public abstract class TaskDao {
     	public static Criterion isVisible() {
     	    return Task.HIDE_UNTIL.lt(Functions.now());
         }
-
-    	/** @return tasks that have a blank or null title */
-        public static Criterion hasNoTitle() {
-    	    return Criterion.or(Task.TITLE.isNull(), Task.TITLE.eq(""));
-    	}
     }
 
     @android.arch.persistence.room.Query("SELECT remoteId FROM tasks WHERE _id = :localId")
diff --git a/app/src/main/java/com/todoroo/astrid/service/StartupService.java b/app/src/main/java/com/todoroo/astrid/service/StartupService.java
index 28cd94149..9c79dfbf8 100644
--- a/app/src/main/java/com/todoroo/astrid/service/StartupService.java
+++ b/app/src/main/java/com/todoroo/astrid/service/StartupService.java
@@ -14,8 +14,6 @@ import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Multimaps;
 import com.todoroo.astrid.dao.Database;
-import org.tasks.data.TagDataDao;
-import org.tasks.data.TagData;
 import com.todoroo.astrid.tags.TagService;
 
 import org.tasks.BuildConfig;
@@ -25,6 +23,8 @@ import org.tasks.analytics.Tracker;
 import org.tasks.analytics.Tracking;
 import org.tasks.data.Tag;
 import org.tasks.data.TagDao;
+import org.tasks.data.TagData;
+import org.tasks.data.TagDataDao;
 import org.tasks.injection.ForApplication;
 import org.tasks.preferences.Preferences;
 import org.tasks.scheduling.BackgroundScheduler;
@@ -43,7 +43,6 @@ public class StartupService {
 
     private final Database database;
     private final Preferences preferences;
-    private final TaskDeleter taskDeleter;
     private final Tracker tracker;
     private final TagDataDao tagDataDao;
     private final TagService tagService;
@@ -52,13 +51,12 @@ public class StartupService {
     private final TagDao tagDao;
 
     @Inject
-    public StartupService(Database database, Preferences preferences, TaskDeleter taskDeleter,
-                          Tracker tracker, TagDataDao tagDataDao, TagService tagService,
+    public StartupService(Database database, Preferences preferences, Tracker tracker,
+                          TagDataDao tagDataDao, TagService tagService,
                           LocalBroadcastManager localBroadcastManager,
                           @ForApplication Context context, TagDao tagDao) {
         this.database = database;
         this.preferences = preferences;
-        this.taskDeleter = taskDeleter;
         this.tracker = tracker;
         this.tagDataDao = tagDataDao;
         this.tagService = tagService;
@@ -94,9 +92,6 @@ public class StartupService {
         }
 
         BackgroundScheduler.enqueueWork(context);
-
-        // perform startup activities in a background thread
-        new Thread(() -> taskDeleter.deleteTasksWithEmptyTitles()).start();
     }
 
     private void upgrade(int from, int to) {
diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.java b/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.java
index 2fe75ee8d..25fbf0718 100644
--- a/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.java
+++ b/app/src/main/java/com/todoroo/astrid/service/TaskDeleter.java
@@ -1,6 +1,5 @@
 package com.todoroo.astrid.service;
 
-import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.dao.TaskDao;
@@ -24,17 +23,6 @@ public class TaskDeleter {
         this.taskDao = taskDao;
     }
 
-    /**
-     * Clean up tasks. Typically called on startup
-     */
-    void deleteTasksWithEmptyTitles() {
-        Query query = Query.select(Task.ID).where(TaskDao.TaskCriteria.hasNoTitle());
-        for (Task task : taskDao.toList(query)) {
-            long id = task.getId();
-            taskDao.delete(id);
-        }
-    }
-
     public void delete(Task item) {
         if(!item.isSaved()) {
             return;