Fixed some control set bugs and display issues

astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java

@@ -220,19 +220,14 @@ public final class TagsControlSet extends PopupControlSet {
     }
 
     @Override
-    protected void readFromTaskPrivate() {
+    public void readFromTask(Task task) {
-        newTags.removeAllViews();
+        super.readFromTask(task);
-
-        for (int i = 0; i < selectedTags.getCount(); i++) { // clear all selected items
-            selectedTags.setItemChecked(i, false);
-        }
         if(model.getId() != AbstractModel.NO_ID) {
             TodorooCursor<Metadata> cursor = tagService.getTags(model.getId());
             LinkedHashSet<String> tags = new LinkedHashSet<String>(cursor.getCount());
             try {
                 for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                     String tag = cursor.get(TagService.TAG);
-                    setTagSelected(tag);
                     tags.add(tag);
                 }
             } finally {
@@ -240,11 +235,32 @@ public final class TagsControlSet extends PopupControlSet {
             }
             model.putTransitory("tags", tags); //$NON-NLS-1$
         }
+    }
+
+    @Override
+    protected void readFromTaskPrivate() {
+        newTags.removeAllViews();
+
+        for (int i = 0; i < selectedTags.getCount(); i++) { // clear all selected items
+            selectedTags.setItemChecked(i, false);
+        }
+        if(model.getId() != AbstractModel.NO_ID) {
+            selectTagsFromModel();
+        }
         addTag("", false); //$NON-NLS-1$
         refreshDisplayView();
         populated = true;
     }
 
+    private void selectTagsFromModel() {
+        LinkedHashSet<String> tags = (LinkedHashSet<String>) model.getTransitory("tags");
+        if (tags != null) {
+            for (String tag : tags) {
+                setTagSelected(tag);
+            }
+        }
+    }
+
     @Override
     protected void afterInflate() {
         Tag[] allTags = getTagArray();

astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java

@@ -89,7 +89,7 @@ public class DeadlineControlSet extends PopupControlSet {
     }
 
     public boolean isDeadlineSet() {
-        return dateAndTimePicker.constructDueDate() != 0;
+        return (dateAndTimePicker != null && dateAndTimePicker.constructDueDate() != 0);
     }
 
     /**

astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java

@@ -168,7 +168,9 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
     public void setDefaults() {
         int setting = Preferences.getIntegerFromString(R.string.p_default_hideUntil_key,
                 Task.HIDE_UNTIL_NONE);
-        spinner.setSelection(setting);
+        selection = setting;
+        if (spinner != null)
+            spinner.setSelection(selection);
         refreshDisplayView();
     }