diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmDataService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmDataService.java index 6fe8a738e..190dfe6e9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmDataService.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmDataService.java @@ -27,7 +27,6 @@ import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.notes.NoteMetadata; import com.todoroo.astrid.service.MetadataService; -import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.tags.TagService; @@ -76,7 +75,6 @@ public final class ActFmDataService { */ public TodorooCursor getLocallyCreated(Property[] properties) { return taskDao.query(Query.select(properties).where(Criterion.and(TaskCriteria.isActive(), - Task.ID.gt(StartupService.INTRO_TASK_SIZE), Task.REMOTE_ID.eq(0)))); } diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java index 0aedd5480..c3acb0747 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java @@ -20,7 +20,6 @@ import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.AstridDependencyInjector; -import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.sync.SyncResultCallback; import com.todoroo.astrid.sync.SyncV2Provider; @@ -131,7 +130,6 @@ public class ActFmSyncV2Provider extends SyncV2Provider { TodorooCursor cursor = taskService.query(Query.select(Task.PROPERTIES). where(Criterion.or( Criterion.and(TaskCriteria.isActive(), - Task.ID.gt(StartupService.INTRO_TASK_SIZE), Task.REMOTE_ID.eq(0)), Criterion.and(Task.REMOTE_ID.gt(0), Task.MODIFICATION_DATE.gt(Task.LAST_SYNC))))); diff --git a/astrid/src/com/todoroo/astrid/activity/Eula.java b/astrid/src/com/todoroo/astrid/activity/Eula.java index 5d06e5539..d6e791204 100644 --- a/astrid/src/com/todoroo/astrid/activity/Eula.java +++ b/astrid/src/com/todoroo/astrid/activity/Eula.java @@ -25,7 +25,6 @@ import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; -import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.TaskService; @@ -97,7 +96,7 @@ public final class Eula { if(p.getBoolean(PREFERENCE_EULA_ACCEPTED, false)) return false; - if(taskService.countTasks() > StartupService.INTRO_TASK_SIZE) + if(taskService.countTasks() > 0) return false; return true; } diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java index 071eb8fff..da5077e0c 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java @@ -57,7 +57,6 @@ import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.core.CustomFilterActivity; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.tags.TagsPlugin; import com.todoroo.astrid.welcome.HelpInfoPopover; @@ -138,18 +137,6 @@ public class FilterListFragment extends ListFragment { } } - /** Called when loading up the activity */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - // Tell the framework to try to keep this fragment around - // during a configuration change. -// setRetainInstance(true); - - new StartupService().onStartupApplication(getActivity()); - } - /* (non-Javadoc) * @see com.todoroo.astrid.fragment.ExpandableListFragment#onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle) */ diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index ce104ff8b..d080117a6 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -791,7 +791,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { long idParam = intent.getLongExtra(TOKEN_ID, -1L); - database.openForReading(); if (idParam > -1L) { model = taskService.fetchById(idParam, Task.PROPERTIES); if (model != null) { diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java index 898ae0bc1..c85530898 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java @@ -115,7 +115,6 @@ import com.todoroo.astrid.repeats.RepeatControlSet; import com.todoroo.astrid.service.AddOnService; import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.service.MetadataService; -import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.SyncV2Service; @@ -300,13 +299,6 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, public void onCreate(Bundle savedInstanceState) { DependencyInjectionService.getInstance().inject(this); super.onCreate(savedInstanceState); - - new StartupService().onStartupApplication(getActivity()); - - if (database == null) - return; - - database.openForWriting(); } /* diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java index 1ef8fe950..557bdfe37 100644 --- a/astrid/src/com/todoroo/astrid/service/StartupService.java +++ b/astrid/src/com/todoroo/astrid/service/StartupService.java @@ -101,7 +101,7 @@ public class StartupService { /** Called when this application is started up */ public synchronized void onStartupApplication(final Context context) { - if(hasStartedUp) + if(hasStartedUp || context == null) return; // sets up context manager @@ -209,8 +209,6 @@ public class StartupService { hasStartedUp = true; } - public static final int INTRO_TASK_SIZE = 0; - /** * If database exists, no tasks but metadata, and a backup file exists, restore it */ diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java index ddd08d771..70862198d 100644 --- a/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java +++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java @@ -23,7 +23,6 @@ import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.repeats.RepeatTaskCompleteListener; -import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.test.DatabaseTestCase; import com.todoroo.astrid.utility.Flags; @@ -117,11 +116,6 @@ abstract public class AbstractSyncRepeatTests extends DatabaseTest protected void testRepeating(boolean completeBefore, boolean fromCompletion, RRule rrule, Frequency frequency, String title) { - for (int i = 0; i < StartupService.INTRO_TASK_SIZE; i++) { // Create startup tasks so sync services don't miss the test tasks - Task temp = new Task(); - temp.setValue(Task.TITLE, "" + i); - taskDao.save(temp); - } Task t = new Task(); t.setValue(Task.TITLE, title); long dueDate = DateUtilities.now() + DateUtilities.ONE_DAY * 3; @@ -155,11 +149,8 @@ abstract public class AbstractSyncRepeatTests extends DatabaseTest Task task = new Task(cursor); System.err.println("Task: " + task.getValue(Task.TITLE) + ", due: " + task.getValue(Task.DUE_DATE)); } - assertEquals(StartupService.INTRO_TASK_SIZE + 2, cursor.getCount()); + assertEquals(2, cursor.getCount()); cursor.moveToFirst(); - for (int i = 0; i < StartupService.INTRO_TASK_SIZE; i++) { - cursor.moveToNext(); - } t.readFromCursor(cursor); assertEquals(title, t.getValue(Task.TITLE)); diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java index 5afa12649..aa2f1d9b3 100644 --- a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java +++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java @@ -25,7 +25,6 @@ import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.repeats.RepeatTaskCompleteListener; import com.todoroo.astrid.service.MetadataService; -import com.todoroo.astrid.service.StartupService; public class RepeatTestsActFmSync extends AbstractSyncRepeatTests { @@ -121,11 +120,6 @@ public class RepeatTestsActFmSync extends AbstractSyncRepeatTests { @Override protected void testRepeating(boolean completeBefore, boolean fromCompletion, RRule rrule, Frequency frequency, String title) { - for (int i = 0; i < StartupService.INTRO_TASK_SIZE; i++) { // Create startup tasks so sync services don't miss the test tasks - Task temp = new Task(); - temp.setValue(Task.TITLE, "" + i); - taskDao.save(temp); - } Task t = new Task(); t.setValue(Task.TITLE, title); long dueDate = DateUtilities.now() + DateUtilities.ONE_DAY * 3; @@ -154,11 +148,8 @@ public class RepeatTestsActFmSync extends AbstractSyncRepeatTests { TodorooCursor cursor = taskDao.query(Query.select(Task.PROPERTIES).where(TaskCriteria.notDeleted())); try { - assertEquals(StartupService.INTRO_TASK_SIZE + 1, cursor.getCount()); + assertEquals(1, cursor.getCount()); cursor.moveToFirst(); - for (int i = 0; i < StartupService.INTRO_TASK_SIZE; i++) { - cursor.moveToNext(); - } t.readFromCursor(cursor); long fromDate = (fromCompletion? completionDate : dueDate);