Fix for NPE and issue with aborting tag save causing crash

astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java

@@ -196,7 +196,6 @@ public class TagSettingsActivity extends FragmentActivity {
     }
 
     private void saveSettings() {
-        setResult(RESULT_OK);
         String oldName = tagData.getValue(TagData.NAME);
         String newName = tagName.getText().toString().trim();
 
@@ -306,6 +305,7 @@ public class TagSettingsActivity extends FragmentActivity {
 
             return;
         } else {
+            setResult(RESULT_OK);
             tagDataService.save(tagData);
         }
 

astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java

@@ -217,6 +217,9 @@ public class TagViewFragment extends TaskListFragment {
     @Override
     public void loadTaskListContent(boolean requery) {
         super.loadTaskListContent(requery);
+        if(taskAdapter == null || taskAdapter.getCursor() == null)
+            return;
+
         int count = taskAdapter.getCursor().getCount();
 
         if(tagData != null && sortFlags <= SortHelper.FLAG_REVERSE_SORT &&