From f8c638158ff5046b6f816ea06d20cc6aa262caac Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Sat, 24 Apr 2010 00:48:39 -0700
Subject: [PATCH]   Cleaned up error messages when SD card doesn't exist.

---
 res/values/strings.xml                        |  7 +++---
 .../astrid/utilities/TasksXmlExporter.java    | 22 ++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 161137b68..4f634292c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -418,9 +418,10 @@ Skipped %d tasks.\n
     <!-- Error Messages -->  
     <skip />
     
-        <string name="error_opening">Couldn't find this item:</string>
-        <string name="error_saving">Couldn't save:</string>
-        <string name="error_sdcard">Cannot access:</string>
+        <string name="error_opening">Could not find this item: </string>
+        <string name="error_saving">Could not save:s</string>
+        <string name="error_sdcard">Cannot access folder: %s</string>
+        <string name="error_sdcard_general">Cannot access your SD card!</string>
         
     <skip />
 
diff --git a/src/com/timsu/astrid/utilities/TasksXmlExporter.java b/src/com/timsu/astrid/utilities/TasksXmlExporter.java
index e676ecbb7..2d2b8fa0e 100644
--- a/src/com/timsu/astrid/utilities/TasksXmlExporter.java
+++ b/src/com/timsu/astrid/utilities/TasksXmlExporter.java
@@ -1,5 +1,16 @@
 package com.timsu.astrid.utilities;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.xmlpull.v1.XmlSerializer;
+
 import android.content.Context;
 import android.database.Cursor;
 import android.os.Environment;
@@ -7,6 +18,7 @@ import android.os.Looper;
 import android.util.Log;
 import android.util.Xml;
 import android.widget.Toast;
+
 import com.timsu.astrid.R;
 import com.timsu.astrid.data.alerts.AlertController;
 import com.timsu.astrid.data.sync.SyncDataController;
@@ -17,12 +29,6 @@ import com.timsu.astrid.data.tag.TagModelForView;
 import com.timsu.astrid.data.task.TaskController;
 import com.timsu.astrid.data.task.TaskIdentifier;
 import com.timsu.astrid.data.task.TaskModelForXml;
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.*;
 
 public class TasksXmlExporter {
 
@@ -208,7 +214,7 @@ public class TasksXmlExporter {
                 return true;
             } else {
                 // Unable to make the /sdcard/astrid directory.
-                String error = ctx.getString(R.string.error_sdcard) + astridDir.getAbsolutePath();
+                String error = ctx.getString(R.string.error_sdcard, astridDir.getAbsolutePath());
                 Log.e("TasksXmlExporter", error);
                 if (!isService) {
                     displayErrorToast(error);
@@ -217,7 +223,7 @@ public class TasksXmlExporter {
             }
         } else {
             // Unable to access the sdcard because it's not in the mounted state.
-            String error = ctx.getString(R.string.error_sdcard);
+            String error = ctx.getString(R.string.error_sdcard_general);
             Log.e("TasksXmlExporter", error);
             if (!isService) {
                 displayErrorToast(error);