diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index e7076dba6..c90494dd4 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -20,25 +20,25 @@ import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.view.ContextMenu; +import android.view.ContextMenu.ContextMenuInfo; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.view.Window; -import android.view.ContextMenu.ContextMenuInfo; import android.view.View.OnClickListener; import android.view.View.OnKeyListener; +import android.view.Window; import android.view.inputmethod.EditorInfo; import android.widget.AbsListView; +import android.widget.AbsListView.OnScrollListener; +import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.EditText; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; -import android.widget.Toast; -import android.widget.AbsListView.OnScrollListener; -import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.TextView.OnEditorActionListener; +import android.widget.Toast; import com.flurry.android.FlurryAgent; import com.timsu.astrid.R; @@ -71,7 +71,6 @@ import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.widget.TasksWidget; /** * Primary activity for the Bente application. Shows a list of upcoming @@ -389,9 +388,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener { @Override protected void onStop() { - // update the widget - startService(new Intent(this, TasksWidget.UpdateService.class)); - super.onStop(); FlurryAgent.onEndSession(this); } diff --git a/astrid/src/com/todoroo/astrid/dao/MetadataDao.java b/astrid/src/com/todoroo/astrid/dao/MetadataDao.java index 30d73c62f..5b269fe29 100644 --- a/astrid/src/com/todoroo/astrid/dao/MetadataDao.java +++ b/astrid/src/com/todoroo/astrid/dao/MetadataDao.java @@ -17,6 +17,7 @@ import com.todoroo.andlib.sql.Join; import com.todoroo.andlib.sql.Query; import com.todoroo.astrid.model.Metadata; import com.todoroo.astrid.model.Task; +import com.todoroo.astrid.provider.Astrid2TaskProvider; /** * Data Access layer for {@link Metadata}-related operations. @@ -60,7 +61,12 @@ public class MetadataDao extends GenericDao { } - + @Override + public boolean persist(Metadata item) { + boolean state = super.persist(item); + Astrid2TaskProvider.notifyDatabaseModification(); + return state; + } /** * Fetch all metadata that are unattached to the task diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java index 63460eae3..07f626727 100644 --- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java @@ -20,8 +20,10 @@ import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.model.Task; +import com.todoroo.astrid.provider.Astrid2TaskProvider; import com.todoroo.astrid.reminders.ReminderService; import com.todoroo.astrid.utility.Preferences; +import com.todoroo.astrid.widget.TasksWidget; /** * Data Access layer for {@link Task}-related operations. @@ -213,6 +215,10 @@ public class TaskDao extends GenericDao { ReminderService.getInstance().scheduleAlarm(task); } + Astrid2TaskProvider.notifyDatabaseModification(); + ContextManager.getContext().startService(new Intent(ContextManager.getContext(), + TasksWidget.UpdateService.class)); + if(skipHooks) return; } diff --git a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java index fe86ba392..baefd7b9e 100644 --- a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java +++ b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java @@ -16,6 +16,7 @@ import android.util.Log; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; +import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; @@ -173,7 +174,8 @@ public class Astrid2TaskProvider extends ContentProvider { MatrixCursor ret = new MatrixCursor(TASK_FIELD_LIST); TodorooCursor cursor = taskService.query(Query.select(Task.ID, Task.TITLE, - Task.IMPORTANCE, Task.DUE_DATE).where(TaskCriteria.isActive()). + Task.IMPORTANCE, Task.DUE_DATE).where(Criterion.and(TaskCriteria.isActive(), + TaskCriteria.isVisible())). orderBy(TaskService.defaultTaskOrder()).limit(MAX_NUMBER_OF_TASKS)); try { int[] importanceColors = Task.getImportanceColors(ctx.getResources()); diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index 785022399..fa87c2adc 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -46,25 +46,23 @@ public final class UpgradeService { StringBuilder changeLog = new StringBuilder(); if(from <= 135) - newVersionString(changeLog, "3.0.0 (8/3/10)", new String[] { + newVersionString(changeLog, "3.0.6 (8/4/10)", new String[] { "Astrid is brand new inside and out! In addition to a new " + - "look and feel, a new add-on system allows Astrid to become " + - "more powerful, while other improvements have made it faster " + - "and easier to use. Hope you like it!", + "look and feel, a new add-on system allows Astrid to become " + + "more powerful, while other improvements have made it faster " + + "and easier to use. Hope you like it!", + "This update contains for free all of the " + + "powerpack's features for evaluation purposes", + "If you liked the old version, you can also go back by " + + "clicking here", }); - else if(from > 135 && from <= 140) - newVersionString(changeLog, "3.0.2 (8/4/10)", new String[] { - "Upgrade note: if you are missing old repeating tasks, " + - "search for them, there was a bug where they were marked " + - "as completed.", - "This update also fixes widget issues with Android 1.5. ", - "Thanks for your patience!", - }); - else if(from > 140 && from <= 142) - newVersionString(changeLog, "3.0.4 (8/4/10)", new String[] { - "Making upgrade easier for new Astrid 3 users.", - "Fixed some user-reported crashes", - "We love you!!", + else if(from <= 144) + newVersionString(changeLog, "3.0.6 (8/4/10)", new String[] { + "This update contains for free all of the " + + "powerpack's features for evaluation purposes", + "Fixed widget not updating when tasks are edited", + "If you liked the old version, you can also go back by " + + "clicking here", }); if(changeLog.length() == 0)