Fix issues with new task creation, updated gtasks jar to allow due dates of 0

pull/14/head
Tim Su 14 years ago
parent f8be271b01
commit c1079acf93

Binary file not shown.

@ -69,7 +69,7 @@ public class GtasksDetailExposer extends BroadcastReceiver {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
String listId = metadata.getValue(GtasksMetadata.LIST_ID); String listId = metadata.getValue(GtasksMetadata.LIST_ID);
if(listId == Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST)) if(listId == null || listId.equals(Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST)))
return null; return null;
String listName = gtasksListService.getListName(listId); String listName = gtasksListService.getListName(listId);
if(listName == GtasksListService.LIST_NOT_FOUND) if(listName == GtasksListService.LIST_NOT_FOUND)

@ -246,7 +246,7 @@ public class GtasksTaskListUpdater {
private void updateModifiedDate(Task taskContainer, long taskId) { private void updateModifiedDate(Task taskContainer, long taskId) {
taskContainer.setId(taskId); taskContainer.setId(taskId);
taskContainer.setValue(Task.MODIFICATION_DATE, DateUtilities.now()); taskContainer.setValue(Task.DETAILS_DATE, DateUtilities.now());
PluginServices.getTaskService().save(taskContainer); PluginServices.getTaskService().save(taskContainer);
} }

@ -330,6 +330,7 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
String list = Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST); String list = Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST);
if(local.gtaskMetadata.containsNonNullValue(GtasksMetadata.LIST_ID)) if(local.gtaskMetadata.containsNonNullValue(GtasksMetadata.LIST_ID))
list = local.gtaskMetadata.getValue(GtasksMetadata.LIST_ID); list = local.gtaskMetadata.getValue(GtasksMetadata.LIST_ID);
gtasksTaskListUpdater.updateParentAndSibling(local);
ConvenientTaskCreator createdTask; ConvenientTaskCreator createdTask;
try { try {
@ -352,10 +353,6 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
String idTask = local.gtaskMetadata.getValue(GtasksMetadata.ID); String idTask = local.gtaskMetadata.getValue(GtasksMetadata.ID);
String idList = local.gtaskMetadata.getValue(GtasksMetadata.LIST_ID); String idList = local.gtaskMetadata.getValue(GtasksMetadata.LIST_ID);
// fetch remote task for comparison
if(remote == null && idTask != null)
remote = pull(local);
try { try {
// moving between lists // moving between lists
@ -374,10 +371,10 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
builder.notes(local.task.getValue(Task.NOTES)); builder.notes(local.task.getValue(Task.NOTES));
String id = idList; String id = idList;
ListAction moveAction = l.move(idTask, local.parentId, local.priorSiblingId);
// write task // write task
if(builder instanceof TaskModifier) { if(builder instanceof TaskModifier) {
ListAction moveAction = l.move(idTask, local.parentId, local.priorSiblingId);
ListAction action = ((TaskModifier) builder).done(); ListAction action = ((TaskModifier) builder).done();
if(remote == null || local.parentId != remote.parentId || local.priorSiblingId != remote.priorSiblingId) if(remote == null || local.parentId != remote.parentId || local.priorSiblingId != remote.priorSiblingId)
taskService.executeListActions(idList, action, moveAction); taskService.executeListActions(idList, action, moveAction);
@ -385,6 +382,7 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
taskService.executeListActions(idList, action); taskService.executeListActions(idList, action);
} else { } else {
id = ((ConvenientTaskCreator)builder).go(); id = ((ConvenientTaskCreator)builder).go();
ListAction moveAction = l.move(id, local.parentId, local.priorSiblingId);
taskService.executeListActions(idList, moveAction); taskService.executeListActions(idList, moveAction);
} }

Loading…
Cancel
Save