From abcfe110964c5d5d566e563ee1e41c49fc60fcaf Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 20 Mar 2013 10:31:19 -0700
Subject: [PATCH] Fix a handled exception thrown in the new TLM changeshappened
 logic

---
 .../TaskListMetadataChangesHappened.java      | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java
index 610d4b9b1..ba73feb7f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java
@@ -49,29 +49,31 @@ public class TaskListMetadataChangesHappened extends ChangesHappened<TaskListMet
         }
 
         if (pushedAt == 0 && !foundTagOrFilterId) { // Try to validate message
-            TaskListMetadata tlm = dao.fetch(uuid, TaskListMetadata.FILTER, TaskListMetadata.TAG_UUID);
-            String filterId = tlm.getValue(TaskListMetadata.FILTER);
-            String tagUuid = tlm.getValue(TaskListMetadata.TAG_UUID);
+            TaskListMetadata tlm = dao.fetch(id, TaskListMetadata.FILTER, TaskListMetadata.TAG_UUID);
+            if (tlm != null) {
+                String filterId = tlm.getValue(TaskListMetadata.FILTER);
+                String tagUuid = tlm.getValue(TaskListMetadata.TAG_UUID);
 
-            TaskListMetadataOutstanding tlmo = new TaskListMetadataOutstanding();
-            boolean validChange = false;
+                TaskListMetadataOutstanding tlmo = new TaskListMetadataOutstanding();
+                boolean validChange = false;
 
-            if (!TextUtils.isEmpty(filterId)) {
-                validChange = true;
-                tlmo.setValue(TaskListMetadataOutstanding.ENTITY_ID_PROPERTY, id);
-                tlmo.setValue(TaskListMetadataOutstanding.COLUMN_STRING, TaskListMetadata.FILTER.name);
-                tlmo.setValue(TaskListMetadataOutstanding.VALUE_STRING, filterId);
-                tlmo.setValue(TaskListMetadataOutstanding.CREATED_AT, 0L);
-            } else if (!RemoteModel.isUuidEmpty(tagUuid)) {
-                validChange = true;
-                tlmo.setValue(TaskListMetadataOutstanding.ENTITY_ID_PROPERTY, id);
-                tlmo.setValue(TaskListMetadataOutstanding.COLUMN_STRING, TaskListMetadata.TAG_UUID.name);
-                tlmo.setValue(TaskListMetadataOutstanding.VALUE_STRING, tagUuid);
-                tlmo.setValue(TaskListMetadataOutstanding.CREATED_AT, 0L);
-            }
+                if (!TextUtils.isEmpty(filterId)) {
+                    validChange = true;
+                    tlmo.setValue(TaskListMetadataOutstanding.ENTITY_ID_PROPERTY, id);
+                    tlmo.setValue(TaskListMetadataOutstanding.COLUMN_STRING, TaskListMetadata.FILTER.name);
+                    tlmo.setValue(TaskListMetadataOutstanding.VALUE_STRING, filterId);
+                    tlmo.setValue(TaskListMetadataOutstanding.CREATED_AT, 0L);
+                } else if (!RemoteModel.isUuidEmpty(tagUuid)) {
+                    validChange = true;
+                    tlmo.setValue(TaskListMetadataOutstanding.ENTITY_ID_PROPERTY, id);
+                    tlmo.setValue(TaskListMetadataOutstanding.COLUMN_STRING, TaskListMetadata.TAG_UUID.name);
+                    tlmo.setValue(TaskListMetadataOutstanding.VALUE_STRING, tagUuid);
+                    tlmo.setValue(TaskListMetadataOutstanding.CREATED_AT, 0L);
+                }
 
-            if (validChange) {
-                changes.add(tlmo);
+                if (validChange) {
+                    changes.add(tlmo);
+                }
             }
         }