From 1d21258b0d7d04cb79a7e0bbc24a929a3b8ea781 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Wed, 7 Jul 2010 18:10:29 -0700 Subject: [PATCH] fixed bugs --- astrid/astrid.launch | 2 +- .../todoroo/andlib/data/AbstractDatabase.java | 3 ++ .../astrid/activity/TaskEditActivity.java | 30 +++++++------------ .../todoroo/astrid/adapter/TaskAdapter.java | 4 +-- .../src/com/todoroo/astrid/dao/TaskDao.java | 6 +++- .../todoroo/astrid/widget/TasksWidget.java | 5 ++-- 6 files changed, 23 insertions(+), 27 deletions(-) diff --git a/astrid/astrid.launch b/astrid/astrid.launch index f9929e151..6a8eb7356 100644 --- a/astrid/astrid.launch +++ b/astrid/astrid.launch @@ -4,7 +4,7 @@ - + diff --git a/astrid/common-src/com/todoroo/andlib/data/AbstractDatabase.java b/astrid/common-src/com/todoroo/andlib/data/AbstractDatabase.java index cf834f973..76d80b0e6 100644 --- a/astrid/common-src/com/todoroo/andlib/data/AbstractDatabase.java +++ b/astrid/common-src/com/todoroo/andlib/data/AbstractDatabase.java @@ -109,6 +109,9 @@ abstract public class AbstractDatabase { try { database = helper.getWritableDatabase(); + } catch (NullPointerException e) { + // try again + database = helper.getWritableDatabase(); } catch (SQLiteException writeException) { Log.e("database-" + getName(), "Error opening db", writeException); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java index bc2ca1f82..90bc4b808 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java @@ -87,7 +87,6 @@ import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagService.Tag; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; /** * This activity is responsible for creating new tasks and editing existing @@ -251,11 +250,11 @@ public final class TaskEditActivity extends TabActivity { discardButtonClick(); } }; - final View.OnClickListener mDeleteListener = new View.OnClickListener() { + /*final View.OnClickListener mDeleteListener = new View.OnClickListener() { public void onClick(View v) { deleteButtonClick(); } - }; + };*/ // set up save, cancel, and delete buttons ImageButton saveButtonGeneral = (ImageButton) findViewById(R.id.save_basic); @@ -275,15 +274,11 @@ public final class TaskEditActivity extends TabActivity { ImageButton deleteButtonGeneral = (ImageButton) findViewById(R.id.delete_basic); ImageButton deleteButtonDates = (ImageButton) findViewById(R.id.delete_extra); ImageButton deleteButtonNotify = (ImageButton) findViewById(R.id.delete_addons); - if(isNewTask()) { - deleteButtonGeneral.setVisibility(View.GONE); - deleteButtonDates.setVisibility(View.GONE); - deleteButtonNotify.setVisibility(View.GONE); - } else { - deleteButtonGeneral.setOnClickListener(mDeleteListener); - deleteButtonDates.setOnClickListener(mDeleteListener); - deleteButtonNotify.setOnClickListener(mDeleteListener); - } + + // hide the delete button always for now + deleteButtonGeneral.setVisibility(View.GONE); + deleteButtonDates.setVisibility(View.GONE); + deleteButtonNotify.setVisibility(View.GONE); } /* ====================================================================== @@ -1064,15 +1059,9 @@ public final class TaskEditActivity extends TabActivity { @Override public void readFromModel() { - long time; - if(isNewTask()) { - time = Preferences.getIntegerFromString(R.string.p_rmd_default_random_hours) * - DateUtilities.ONE_HOUR; - } else { - time = model.getValue(Task.REMINDER_PERIOD); - } + long time = model.getValue(Task.REMINDER_PERIOD); - settingCheckbox.setChecked(time > 0); + boolean shouldDisable = time <= 0; if(time <= 0) { time = DateUtilities.ONE_WEEK; } @@ -1082,6 +1071,7 @@ public final class TaskEditActivity extends TabActivity { if(hours[i] * DateUtilities.ONE_HOUR >= time) break; periodSpinner.setSelection(i); + settingCheckbox.setChecked(shouldDisable); } @Override diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index bdce7fa4f..d55783c20 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -247,13 +247,13 @@ public class TaskAdapter extends CursorAdapter { broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, task.getId()); activity.sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - // add loading message + /* add loading message if(viewHolder.loadingDetails == null) { viewHolder.loadingDetails = new TextView(activity); viewHolder.loadingDetails.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemDetails); viewHolder.loadingDetails.setText(R.string.TAd_loading); detailsView.addView(viewHolder.loadingDetails); - } + }*/ } } diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java index 456fd35cc..b9c6ce0e6 100644 --- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java @@ -170,9 +170,13 @@ public class TaskDao extends GenericDao { int setting = Preferences.getIntegerFromString(R.string.p_default_hideUntil_key); item.setValue(Task.HIDE_UNTIL, item.createHideUntil(setting, 0)); } - if(!item.containsValue(Task.REMINDER_PERIOD)) + if(!item.containsValue(Task.REMINDER_PERIOD)) { item.setValue(Task.REMINDER_PERIOD, DateUtilities.ONE_HOUR * Preferences.getIntegerFromString(R.string.p_rmd_default_random_hours)); + } + if(!item.containsValue(Task.REMINDER_FLAGS)) { + item.setValue(Task.REMINDER_FLAGS, Task.NOTIFY_AT_DEADLINE); + } return super.createNew(item); } diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java index 1c8748cbc..eefc45078 100644 --- a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java +++ b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java @@ -57,8 +57,6 @@ public class TasksWidget extends AppWidgetProvider { @Override public void onStart(Intent intent, int startId) { - DependencyInjectionService.getInstance().inject(this); - RemoteViews updateViews = buildUpdate(this); ComponentName thisWidget = new ComponentName(this, @@ -89,7 +87,8 @@ public class TasksWidget extends AppWidgetProvider { views.setOnClickPendingIntent(R.id.taskbody, pendingIntent); Filter inboxFilter = CoreFilterExposer.buildInboxFilter(getResources()); - inboxFilter.sqlQuery += " LIMIT " + numberOfTasks; + inboxFilter.sqlQuery += TaskService.defaultTaskOrder() + " LIMIT " + numberOfTasks; + DependencyInjectionService.getInstance().inject(this); TodorooCursor cursor = null; try { database.openForWriting();