From 75ebb8d81771bdb4a0a9ae2c19d4147f8c4915a5 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 1 Jun 2012 16:13:02 -0700
Subject: [PATCH] Fixed a crash and a minor bug in handling undownloaded files

---
 .../com/todoroo/astrid/actfm/sync/ActFmSyncService.java       | 2 +-
 .../plugin-src/com/todoroo/astrid/files/FilesControlSet.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
index d42176d56..a32d2029d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -1171,7 +1171,7 @@ public final class ActFmSyncService {
                         currentFiles.remove(id);
                     } else {
                         // Create new file attachment
-                        Metadata newAttachment = FileMetadata.createNewFileMetadata(model.getId(), null,
+                        Metadata newAttachment = FileMetadata.createNewFileMetadata(model.getId(), "",
                                 file.getString("name"), file.getString("content_type"));
                         String url = file.getString("url");
                         newAttachment.setValue(FileMetadata.URL, url);
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
index 991eef0fb..f0af3c005 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
@@ -110,7 +110,7 @@ public class FilesControlSet extends PopupControlSet {
             if (m.containsNonNullValue(FileMetadata.FILE_PATH)) {
                 File f = new File(m.getValue(FileMetadata.FILE_PATH));
                 if (!f.exists()) {
-                    m.setValue(FileMetadata.FILE_PATH, null);
+                    m.setValue(FileMetadata.FILE_PATH, ""); //$NON-NLS-1$
                     if (m.containsNonNullValue(FileMetadata.URL)) { // We're ok, just the local file was deleted
                         metadataService.save(m);
                     } else { // No local file and no url -- delete the metadata
@@ -319,7 +319,7 @@ public class FilesControlSet extends PopupControlSet {
                         }
                     });
                 } finally {
-                    pd.dismiss();
+                    DialogUtilities.dismissDialog(activity, pd);
                 }
             }
         }.start();