Cleaned up error messages when SD card doesn't exist.

pull/14/head
Tim Su 16 years ago
parent a29e5de53f
commit f8c638158f

@ -418,9 +418,10 @@ Skipped %d tasks.\n
<!-- Error Messages --> <!-- Error Messages -->
<skip /> <skip />
<string name="error_opening">Couldn't find this item:</string> <string name="error_opening">Could not find this item: </string>
<string name="error_saving">Couldn't save:</string> <string name="error_saving">Could not save:s</string>
<string name="error_sdcard">Cannot access:</string> <string name="error_sdcard">Cannot access folder: %s</string>
<string name="error_sdcard_general">Cannot access your SD card!</string>
<skip /> <skip />

@ -1,5 +1,16 @@
package com.timsu.astrid.utilities; 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.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.os.Environment; import android.os.Environment;
@ -7,6 +18,7 @@ import android.os.Looper;
import android.util.Log; import android.util.Log;
import android.util.Xml; import android.util.Xml;
import android.widget.Toast; import android.widget.Toast;
import com.timsu.astrid.R; import com.timsu.astrid.R;
import com.timsu.astrid.data.alerts.AlertController; import com.timsu.astrid.data.alerts.AlertController;
import com.timsu.astrid.data.sync.SyncDataController; 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.TaskController;
import com.timsu.astrid.data.task.TaskIdentifier; import com.timsu.astrid.data.task.TaskIdentifier;
import com.timsu.astrid.data.task.TaskModelForXml; 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 { public class TasksXmlExporter {
@ -208,7 +214,7 @@ public class TasksXmlExporter {
return true; return true;
} else { } else {
// Unable to make the /sdcard/astrid directory. // 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); Log.e("TasksXmlExporter", error);
if (!isService) { if (!isService) {
displayErrorToast(error); displayErrorToast(error);
@ -217,7 +223,7 @@ public class TasksXmlExporter {
} }
} else { } else {
// Unable to access the sdcard because it's not in the mounted state. // 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); Log.e("TasksXmlExporter", error);
if (!isService) { if (!isService) {
displayErrorToast(error); displayErrorToast(error);

Loading…
Cancel
Save