Fix for AST-265, finally - don't save tasks with blank title, even when created by widget

astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java

@@ -111,6 +111,11 @@ public final class TaskEditActivity extends TabActivity {
      */
     public static final String TOKEN_VALUES = "v"; //$NON-NLS-1$
 
+    /**
+     * Task in progress (during orientation change)
+     */
+    private static final String TASK_IN_PROGRESS = "task_in_progress"; //$NON-NLS-1$
+
     // --- request codes
 
     @SuppressWarnings("unused")
@@ -185,6 +190,17 @@ public final class TaskEditActivity extends TabActivity {
 
 		// disable keyboard until user requests it
 		AndroidUtilities.suppressVirtualKeyboard(title);
+
+		// if we were editing a task already, restore it
+		if(savedInstanceState != null && savedInstanceState.containsKey(TASK_IN_PROGRESS)) {
+		    Task task = savedInstanceState.getParcelable(TASK_IN_PROGRESS);
+		    if(task != null) {
+		        System.err.println("TASK being un-bundled");
+		        model = task;
+		    }
+		}
+
+		setResult(RESULT_OK);
     }
 
     /* ======================================================================
@@ -304,6 +320,12 @@ public final class TaskEditActivity extends TabActivity {
      */
     @SuppressWarnings("nls")
     protected void loadItem(Intent intent) {
+        if(model != null) {
+            // came from bundle
+            isNewTask = (model.getValue(Task.TITLE).length() == 0);
+            return;
+        }
+
         long idParam = intent.getLongExtra(TOKEN_ID, -1L);
 
         database.openForReading();
@@ -323,6 +345,10 @@ public final class TaskEditActivity extends TabActivity {
         if(model.getValue(Task.TITLE).length() == 0) {
             FlurryAgent.onEvent("create-task");
             isNewTask = true;
+
+            // set deletion date until task gets a title
+            model.setValue(Task.DELETION_DATE, DateUtilities.now());
+            System.err.println("new task. deletion date set");
         } else {
             FlurryAgent.onEvent("edit-task");
         }
@@ -354,7 +380,11 @@ public final class TaskEditActivity extends TabActivity {
         for(TaskEditControlSet controlSet : controls)
             controlSet.writeToModel(model);
 
-        if(taskService.save(model, false))
+        if(title.getText().length() > 0)
+            model.setValue(Task.DELETION_DATE, 0L);
+
+        System.err.println("TASK being saved. " + model.getMergedValues());
+        if(taskService.save(model, false) && title.getText().length() > 0)
             showSaveToast();
     }
 
@@ -362,11 +392,13 @@ public final class TaskEditActivity extends TabActivity {
     public void finish() {
         super.finish();
 
-        // abandon editing in this case
-        if(title.getText().length() == 0 && isNewTask) {
+        System.err.println("FINISH. " + title.getText());
+
+        // abandon editing and delete the newly created task if
+        // no title was entered
+
+        if(title.getText().length() == 0 && isNewTask && model.isSaved()) {
             taskService.delete(model);
-            showCancelToast();
-            setResult(RESULT_CANCELED);
         }
     }
 
@@ -418,10 +450,6 @@ public final class TaskEditActivity extends TabActivity {
      * precision
      */
     private void showSaveToast() {
-        // if we have no title, or nothing's changed, don't show toast
-        if(isNewTask)
-            return;
-
         int stringResource;
 
         long due = model.getValue(Task.DUE_DATE);
@@ -492,7 +520,6 @@ public final class TaskEditActivity extends TabActivity {
                 Toast.LENGTH_SHORT).show();
     }
 
-
     @Override
     public boolean onMenuItemSelected(int featureId, MenuItem item) {
         switch(item.getItemId()) {
@@ -532,10 +559,11 @@ public final class TaskEditActivity extends TabActivity {
 
     @Override
     protected void onPause() {
-        if(shouldSaveState)
-            save();
         super.onPause();
         unregisterReceiver(controlReceiver);
+
+        if(shouldSaveState)
+            save();
     }
 
     @Override
@@ -546,6 +574,16 @@ public final class TaskEditActivity extends TabActivity {
         populateFields();
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        System.err.println("bundling. " + title.getText());
+
+        // stick our task into the outState
+        outState.putParcelable(TASK_IN_PROGRESS, model);
+    }
+
     @Override
     protected void onStart() {
         super.onStart();

astrid/src/com/todoroo/astrid/service/TaskService.java

@@ -122,6 +122,7 @@ public class TaskService {
             return;
         else if(item.containsValue(Task.TITLE) && item.getValue(Task.TITLE).length() == 0) {
             taskDao.delete(item.getId());
+            item.setId(Task.NO_ID);
         } else {
             long id = item.getId();
             item.clear();

astrid/src/com/todoroo/astrid/widget/TasksWidget.java

@@ -188,7 +188,7 @@ public class TasksWidget extends AppWidgetProvider {
             views.setOnClickPendingIntent(R.id.taskbody, pendingIntent);
 
             Intent editIntent = new Intent(context, TaskEditActivity.class);
-            editIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            editIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
             if(filter != null && filter.valuesForNewTasks != null) {
                 String values = AndroidUtilities.contentValuesToSerializedString(filter.valuesForNewTasks);
                 editIntent.putExtra(TaskEditActivity.TOKEN_VALUES, values);