archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

polished up backup

Browse Source
pull/14/head
Tim Su 16 years ago
parent 8082b94c2c
commit b30e9a8e56
5 changed files with 95 additions and 28 deletions
Show Stats Download Patch File Download Diff File

3
astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
Unescape Escape View File

@ -31,6 +31,9 @@ public class BackupService extends Service {
public static final String BACKUP_FILE_NAME_REGEX = "auto\\.[-\\d]+\\.xml";
private static final int DAYS_TO_KEEP_BACKUP = 7;
static final String PREF_BACKUP_LAST_ERROR = "backupError";
static final String PREF_BACKUP_LAST_DATE = "backupDate";
@Override
public IBinder onBind(Intent intent) {
return null;

81
astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java
Unescape Escape View File

@ -6,7 +6,10 @@ import java.io.IOException;
import org.xmlpull.v1.XmlSerializer;
import android.app.ProgressDialog;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import android.util.Xml;
import android.widget.Toast;
@ -19,6 +22,7 @@ import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.ExceptionService;
import com.todoroo.andlib.sql.Order;
import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
import com.todoroo.astrid.model.Metadata;
@ -46,27 +50,67 @@ public class TasksXmlExporter {
private static final int FORMAT = 2;
private final Context context;
private final boolean isService;
private int exportCount;
private XmlSerializer xml;
private final TaskService taskService = PluginServices.getTaskService();
private final MetadataService metadataService = PluginServices.getMetadataService();
private final ExceptionService exceptionService = PluginServices.getExceptionService();
private TasksXmlExporter(Context context, boolean isService) {
private final ProgressDialog progressDialog;
private final Handler importHandler;
private void setProgress(final int taskNumber, final int total, final String title) {
importHandler.post(new Runnable() {
public void run() {
progressDialog.setProgress(taskNumber * 10000 / total);
progressDialog.setMessage(context.getString(R.string.export_progress_read, title));
}
});
}
private TasksXmlExporter(final Context context, final boolean isService) {
this.context = context;
this.isService = isService;
this.exportCount = 0;
progressDialog = new ProgressDialog(context);
importHandler = new Handler();
importHandler.post(new Runnable() {
@Override
public void run() {
progressDialog.setIcon(android.R.drawable.ic_dialog_info);
progressDialog.setTitle(R.string.export_progress_title);
progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
progressDialog.setCancelable(false);
progressDialog.setIndeterminate(false);
progressDialog.show();
}
});
new Thread(new Runnable() {
@Override
public void run() {
Looper.prepare();
try {
String output = setupFile(BackupConstants.getExportDirectory());
String output = setupFile(BackupConstants.getExportDirectory(),
isService);
doTasksExport(output);
} catch (Exception e) {
Preferences.setLong(BackupService.PREF_BACKUP_LAST_DATE,
DateUtilities.now());
if (!isService)
displayToast(output);
} catch (IOException e) {
if(!isService)
displayErrorToast(e);
exceptionService.reportError("backup-exception", e); //$NON-NLS-1$
// TODO record last backup error
exceptionService.displayAndReportError(context,
context.getString(R.string.backup_TXI_error), e);
else {
exceptionService.reportError("background-backup", e); //$NON-NLS-1$
Preferences.setString(BackupService.PREF_BACKUP_LAST_ERROR, e.toString());
}
}
Looper.loop();
}
}).start();
}
@ -93,10 +137,6 @@ public class TasksXmlExporter {
xml.endDocument();
xml.flush();
fos.close();
if (!isService) {
displayToast(output);
}
}
private void serializeTasks() throws IOException {
@ -104,9 +144,13 @@ public class TasksXmlExporter {
Task.PROPERTIES).orderBy(Order.asc(Task.ID)));
try {
Task task = new Task();
for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
int length = cursor.getCount();
for(int i = 0; i < length; i++) {
cursor.moveToNext();
task.readFromCursor(cursor);
setProgress(i, length, task.getValue(Task.TITLE));
xml.startTag(null, BackupConstants.TASK_TAG);
serializeModel(task, Task.PROPERTIES);
serializeMetadata(task);
@ -142,10 +186,11 @@ public class TasksXmlExporter {
private void serializeModel(AbstractModel model, Property<?>[] properties) {
for(Property<?> property : properties) {
try {
Log.e("read", "reading " + property.name + " from " + model.getDatabaseValues());
property.accept(xmlWritingVisitor, model);
} catch (Exception e) {
Log.e("caught", "caught while reading " + property.name + " from " + model.getDatabaseValues(), e);
Log.e("astrid-exporter", //$NON-NLS-1$
"Caught exception while reading " + property.name + //$NON-NLS-1$
" from " + model.getDatabaseValues(), e); //$NON-NLS-1$
}
}
}
@ -221,17 +266,13 @@ public class TasksXmlExporter {
Toast.makeText(context, text, Toast.LENGTH_LONG).show();
}
private void displayErrorToast(Exception error) {
Toast.makeText(context, error.toString(), Toast.LENGTH_LONG).show();
}
/**
* Creates directories if necessary and returns fully qualified file
* @param directory
* @return output file name
* @throws IOException
*/
private String setupFile(File directory) throws IOException {
private String setupFile(File directory, boolean isService) throws IOException {
File astridDir = directory;
if (astridDir != null) {
// Check for /sdcard/astrid directory. If it doesn't exist, make it.

15
astrid/res/values/strings-backup.xml
Unescape Escape View File

@ -51,9 +51,22 @@ File %s contained %s.\n\n
%s already exist\n
</string>
<string name="import_progress_title">Restore</string>
<!-- Progress Dialog Title for importing -->
<string name="import_progress_title">Importing...</string>
<!-- Progress Dialog Title for exporting -->
<string name="export_progress_title">Exporting...</string>
<!-- Progress Dialog text for import opening file -->
<string name="import_progress_open">Opening file...</string>
<!-- Progress Dialog text for import reading task (%d -> task number)-->
<string name="import_progress_read">Reading task %d...</string>
<!-- Progress Dialog text for export reading task (%s -> task title) -->
<string name="export_progress_read">Reading task %s...</string>
<!-- File Selector dialog for import -->
<string name="import_file_prompt">Select a File to Restore</string>
</resources>

2
astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
Unescape Escape View File

@ -284,6 +284,8 @@ public class FilterAdapter extends BaseExpandableListAdapter {
public void registerRecevier() {
activity.registerReceiver(filterReceiver,
new IntentFilter(AstridApiConstants.BROADCAST_SEND_FILTERS));
if(getGroupCount() == 0)
getLists();
}
/**

10
astrid/src/com/todoroo/astrid/utility/Preferences.java
Unescape Escape View File

@ -155,9 +155,17 @@ public class Preferences {
* Sets string preference
*/
public static void setString(int keyResource, String newValue) {
Context context = ContextManager.getContext();
setString(context.getString(keyResource), newValue);
}
/**
* Sets string preference
*/
public static void setString(String key, String newValue) {
Context context = ContextManager.getContext();
Editor editor = getPrefs(context).edit();
editor.putString(context.getString(keyResource), newValue);
editor.putString(key, newValue);
editor.commit();
}

Write Preview
Loading…
Cancel
Save