From 510f1b187ccc7f2aa58288785436e0b80fa2a86a Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 25 Oct 2019 16:20:42 -0500
Subject: [PATCH] Fix bug forcing new tasks to top

---
 .../tasks/gtasks/GoogleTaskSynchronizer.java  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

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