From 457059cd913ea617ae47f6e09488c882dc56314e Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 14 Sep 2010 17:30:00 +0800
Subject: [PATCH] Fix for NPE in custom filter activity

---
 .../com/todoroo/astrid/core/CustomFilterActivity.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
index 0617ba7c8..c66968c8e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -343,7 +343,7 @@ public class CustomFilterActivity extends ListActivity {
         for(int i = 0; i < adapter.getCount(); i++) {
             CriterionInstance instance = adapter.getItem(i);
             String value = instance.getValueFromCriterion();
-            if(value == null && instance.criterion.sql.contains("?"))
+            if(value == null && instance.criterion.sql != null && instance.criterion.sql.contains("?"))
                 continue;
 
             String title = instance.getTitleFromCriterion();
@@ -414,7 +414,7 @@ public class CustomFilterActivity extends ListActivity {
         for(int i = 0; i < adapter.getCount(); i++) {
             CriterionInstance instance = adapter.getItem(i);
             String value = instance.getValueFromCriterion();
-            if(value == null && instance.criterion.sql.contains("?"))
+            if(value == null && instance.criterion.sql != null && instance.criterion.sql.contains("?"))
                 continue;
 
             switch(instance.type) {