Fix bug forcing new tasks to top

pull/848/head^2
Alex Baker 6 years ago
parent d61bc2b4cf
commit 510f1b187c

@ -339,16 +339,11 @@ public class GoogleTaskSynchronizer {
} }
if (newlyCreated) { if (newlyCreated) {
String localParent = long parent = gtasksMetadata.getParent();
gtasksMetadata.getParent() > 0 String localParent = parent > 0 ? googleTaskDao.getRemoteId(parent) : null;
? googleTaskDao.getRemoteId(gtasksMetadata.getParent())
: null;
String previous = String previous =
Strings.isNullOrEmpty(localParent) googleTaskDao.getPrevious(
? null listId, Strings.isNullOrEmpty(localParent) ? 0 : parent, gtasksMetadata.getOrder());
: googleTaskDao.getPrevious(
listId, gtasksMetadata.getParent(), gtasksMetadata.getOrder());
com.google.api.services.tasks.model.Task created; com.google.api.services.tasks.model.Task created;
try { try {
@ -371,13 +366,14 @@ public class GoogleTaskSynchronizer {
try { try {
if (!task.isDeleted() && gtasksMetadata.isMoved()) { if (!task.isDeleted() && gtasksMetadata.isMoved()) {
try { try {
String localParent = long parent = gtasksMetadata.getParent();
gtasksMetadata.getParent() > 0 String localParent = parent > 0 ? googleTaskDao.getRemoteId(parent) : null;
? googleTaskDao.getRemoteId(gtasksMetadata.getParent())
: null;
String previous = String previous =
googleTaskDao.getPrevious( googleTaskDao.getPrevious(
listId, gtasksMetadata.getParent(), gtasksMetadata.getOrder()); listId,
Strings.isNullOrEmpty(localParent) ? 0 : parent,
gtasksMetadata.getOrder());
com.google.api.services.tasks.model.Task result = com.google.api.services.tasks.model.Task result =
gtasksInvoker.moveGtask(listId, remoteModel.getId(), localParent, previous); gtasksInvoker.moveGtask(listId, remoteModel.getId(), localParent, previous);
gtasksMetadata.setRemoteOrder(Long.parseLong(result.getPosition())); gtasksMetadata.setRemoteOrder(Long.parseLong(result.getPosition()));

Loading…
Cancel
Save