archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Got rid of calls to startup service from fragments, got rid of INTRO_TASK_SIZE

Browse Source
pull/14/head
Tim Su 13 years ago
parent 36a4ac5549
commit b1c600458f
9 changed files with 4 additions and 51 deletions
Show Stats Download Patch File Download Diff File

2
astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmDataService.java
Unescape Escape View File

@ -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<Task> 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))));
}

2
astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
Unescape Escape View File

@ -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<Task> 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)))));

3
astrid/src/com/todoroo/astrid/activity/Eula.java
Unescape Escape View File

@ -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;
}

13
astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
Unescape Escape View File

@ -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)
*/

1
astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
Unescape Escape View File

@ -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) {

8
astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
Unescape Escape View File

@ -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();
}
/*

4
astrid/src/com/todoroo/astrid/service/StartupService.java
Unescape Escape View File

@ -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
*/

11
tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java
Unescape Escape View File

@ -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<REMOTE_MODEL> 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<REMOTE_MODEL> 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));

11
tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
Unescape Escape View File

@ -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<Task> {
@ -121,11 +120,6 @@ public class RepeatTestsActFmSync extends AbstractSyncRepeatTests<Task> {
@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<Task> {
TodorooCursor<Task> 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);

Write Preview
Loading…
Cancel
Save