Fixes to the [untagged] business. Think it works now. Also, fix to the way the locale reminder string is displayed - using task plural.

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionCode="101"
+      android:versionCode="102"
-      android:versionName="2.7.3">
+      android:versionName="2.8.0">
       
     <!-- ============================ Metadata ============================ -->   
       

res/values/strings.xml

@@ -103,7 +103,8 @@
     <skip />
         <!-- title bar -->
         <string name="taskList_titlePrefix">Astrid: </string>
-        <string name="taskList_titleTagPrefix">Tagged \"%s\": </string>
+        <string name="taskList_titleTagPrefix">Tagged \"%s\":</string>
+        <string name="taskList_titleUntagged">Untagged Tasks:</string>
         <string name="taskList_hiddenSuffix"> hidden</string>
         <string name="addtask_label">New Task</string>
         <string name="missing_tag">Could Not Find Requested Tag!</string>
@@ -343,7 +344,7 @@ Thanks for using Astrid!\n
         <string name="notif_definiteDueDate">Absolute Deadline!</string>
         <string name="notif_preferredDueDate">Goal Deadline!</string>
         <string name="notif_timerStarted">Working on:</string>
-        <string name="notif_tagNotification">You have %d tasks tagged %s!</string>
+        <string name="notif_tagNotification">You have %s tagged %s!</string>
         
     <!-- Error Messages -->  
     <skip />

src/com/timsu/astrid/activities/TagListSubActivity.java

@@ -83,6 +83,7 @@ public class TagListSubActivity extends SubActivity {
     HashMap<TagModelForView, Integer> tagToTaskCount;
     private Handler handler;
     private TextView loadingText;
+    private boolean untaggedTagDisplayed;
 
     private static SortMode sortMode = SortMode.SIZE;
     private static boolean sortReverse = false;
@@ -164,9 +165,12 @@ public class TagListSubActivity extends SubActivity {
         // show "untagged" as a category at the top, in the proper language/localization
         String untaggedLabel = getResources().getString(R.string.tagList_untagged);
         TagModelForView untaggedModel = TagModelForView.getUntaggedModel(untaggedLabel);
-        tagArray.addFirst(untaggedModel);
         int count = countActiveTasks(activeTasks, getTagController().getUntaggedTasks());
+        if(count > 0) {
+        	untaggedTagDisplayed = true;
+	        tagArray.addFirst(untaggedModel);
 	        tagToTaskCount.put(untaggedModel, count);
+        }
 
         if(sortReverse)
             Collections.reverse(tagArray);
@@ -208,10 +212,13 @@ public class TagListSubActivity extends SubActivity {
     private void setUpListUI(ListAdapter adapter) {
         // set up the title
         Resources r = getResources();
+        int tags = tagArray.size();
+        if(untaggedTagDisplayed)
+        	tags--;
         StringBuilder title = new StringBuilder().
             append(r.getString(R.string.tagList_titlePrefix)).
             append(" ").append(r.getQuantityString(R.plurals.Ntags,
-                tagArray.size(), tagArray.size()));
+                tags, tags));
         final CharSequence finalTitle = title;
         handler.post(new Runnable() {
             public void run() {
@@ -439,7 +446,7 @@ public class TagListSubActivity extends SubActivity {
                 name.setText(new StringBuilder(tag.getName()).
                         append(" (").append(tagCount.get(tag)).append(")"));
 
-                if(tagCount.get(tag) == 0)
+                if(tagCount == null || tagCount.get(tag) == null || tagCount.get(tag) == 0)
                     name.setTextColor(r.getColor(R.color.task_list_done));
                 else
                 	name.setTextColor(r.getColor(android.R.color.white));

src/com/timsu/astrid/activities/TaskListSubActivity.java

@@ -596,9 +596,13 @@ public class TaskListSubActivity extends SubActivity {
                 StringBuilder title = new StringBuilder().
                     append(r.getString(R.string.taskList_titlePrefix)).append(" ");
                 if(context.filterTag != null) {
+                	if(TagModelForView.UNTAGGED_IDENTIFIER.equals(context.filterTag.getTagIdentifier())) {
+                		title.append(r.getString(R.string.taskList_titleUntagged)).append(" ");
+                	} else {
                 		title.append(r.getString(R.string.taskList_titleTagPrefix,
 	                            context.filterTag.getName())).append(" ");
                 	}
+                }
 
                 if(finalCompleted > 0)
                     title.append(r.getQuantityString(R.plurals.NactiveTasks,

src/com/timsu/astrid/data/tag/TagController.java

@@ -20,12 +20,12 @@
 package com.timsu.astrid.data.tag;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.database.CursorJoiner;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 
@@ -128,7 +128,7 @@ public class TagController extends AbstractController {
      * the TagToTask map once for each active task.
      **/
     public LinkedList<TaskIdentifier> getUntaggedTasks() throws SQLException {
-    	LinkedList<TaskIdentifier> list = new LinkedList<TaskIdentifier>();
+    	HashSet<Long> ids = new HashSet<Long>();
 
     	String[] tagMapColumns = new String[] { TagToTaskMapping.TASK };
     	Cursor tagMapCursor = tagToTaskMapDatabase.query(TAG_TASK_MAP_NAME,
@@ -141,23 +141,21 @@ public class TagController extends AbstractController {
     	Cursor taskCursor = taskDatabase.query(TASK_TABLE_NAME, taskColumns,
     			null, null, null, null, KEY_ROWID + " ASC");
 
+    	LinkedList<TaskIdentifier> list = new LinkedList<TaskIdentifier>();
         try {
-        	CursorJoiner joiner = new CursorJoiner(taskCursor, taskColumns,
+        	if(taskCursor.getCount() == 0)
-        			tagMapCursor, tagMapColumns);
+        		return list;
-        	for (CursorJoiner.Result joinerResult : joiner) {
+
-				switch (joinerResult) {
+        	do {
-				case LEFT:
+        		taskCursor.moveToNext();
-					long taskId = taskCursor.getLong(0);
+                ids.add(taskCursor.getLong(0));
-
+            } while(!taskCursor.isLast());
-					// conditional is necessary for handling deleted tasks
+
-					if(tagMapCursor.isLast() || tagMapCursor.getLong(0) > taskId) {
+        	if(tagMapCursor.getCount() > 0) {
-						list.add(new TaskIdentifier(taskId));
+        		do {
-					}
+        			tagMapCursor.moveToNext();
-					break;
+                    ids.remove(tagMapCursor.getLong(0));
-				default:
+                } while(!tagMapCursor.isLast());
-					// in other cases, do nothing
-					break;
-				}
         	}
         } finally {
         	taskCursor.close();
@@ -165,6 +163,8 @@ public class TagController extends AbstractController {
         	taskDatabase.close();
         }
 
+        for(Long id : ids)
+        	list.add(new TaskIdentifier(id));
     	return list;
     }
 

src/com/timsu/astrid/utilities/LocaleReceiver.java

@@ -6,6 +6,7 @@ import java.util.LinkedList;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.util.Log;
 
 import com.timsu.astrid.R;
@@ -47,8 +48,9 @@ public class LocaleReceiver extends BroadcastReceiver {
 							new TagIdentifier(tagId));
 					int count = TagListSubActivity.countActiveTasks(activeTasks, tasks);
 					if(count > 0) {
-						String reminder = context.getResources().getString(
+						Resources r = context.getResources();
-								R.string.notif_tagNotification, count, tagName);
+						String reminder = r.getString(R.string.notif_tagNotification,
+								r.getQuantityString(R.plurals.Ntasks, count, count), tagName);
 						Notifications.showTagNotification(context, tagId, reminder);
 					}
 				} finally {