From 19febfb54fb30f9ad4b336b1adbf706d130624b6 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 27 Dec 2019 09:50:04 -0600
Subject: [PATCH] Don't use task completer for new tasks

---
 app/build.gradle.kts                                        | 2 +-
 app/src/main/java/com/todoroo/astrid/service/TaskMover.java | 1 -
 .../java/com/todoroo/astrid/ui/EditTitleControlSet.java     | 6 +++++-
 app/src/main/java/org/tasks/ui/DeadlineControlSet.java      | 2 --
 app/src/main/java/org/tasks/ui/SubtaskControlSet.java       | 1 +
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2622b73c8..a009697b6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -36,7 +36,7 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 643
+        versionCode = 644
         versionName = "7.4.1"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskMover.java b/app/src/main/java/com/todoroo/astrid/service/TaskMover.java
index dd6fb4af0..bbe6f95ea 100644
--- a/app/src/main/java/com/todoroo/astrid/service/TaskMover.java
+++ b/app/src/main/java/com/todoroo/astrid/service/TaskMover.java
@@ -4,7 +4,6 @@ import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Lists.transform;
 import static com.todoroo.andlib.utility.DateUtilities.now;
 import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
 
 import com.todoroo.astrid.api.CaldavFilter;
 import com.todoroo.astrid.api.Filter;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
index 1987968e8..69fc053e9 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -6,6 +6,8 @@
 
 package com.todoroo.astrid.ui;
 
+import static com.todoroo.andlib.utility.DateUtilities.now;
+
 import android.content.Context;
 import android.graphics.Paint;
 import android.os.Bundle;
@@ -176,7 +178,9 @@ public class EditTitleControlSet extends TaskEditControlFragment {
   @Override
   public void apply(Task task) {
     task.setTitle(Strings.isNullOrEmpty(title) ? getString(R.string.no_title) : title);
-    if (isComplete != task.isCompleted()) {
+    if (task.isNew()) {
+      task.setCompletionDate(isComplete ? now() : 0);
+    } else if (isComplete != task.isCompleted()) {
       taskCompleter.setComplete(task, isComplete);
     }
   }
diff --git a/app/src/main/java/org/tasks/ui/DeadlineControlSet.java b/app/src/main/java/org/tasks/ui/DeadlineControlSet.java
index a2c165624..b5d1715c9 100644
--- a/app/src/main/java/org/tasks/ui/DeadlineControlSet.java
+++ b/app/src/main/java/org/tasks/ui/DeadlineControlSet.java
@@ -37,7 +37,6 @@ import org.tasks.activities.TimePickerActivity;
 import org.tasks.injection.ForActivity;
 import org.tasks.injection.FragmentComponent;
 import org.tasks.preferences.Preferences;
-import org.tasks.themes.ThemeBase;
 import org.tasks.time.DateTime;
 
 public class DeadlineControlSet extends TaskEditControlFragment {
@@ -50,7 +49,6 @@ public class DeadlineControlSet extends TaskEditControlFragment {
   private static final String EXTRA_TIME = "extra_time";
   @Inject Preferences preferences;
   @Inject @ForActivity Context context;
-  @Inject ThemeBase themeBase;
 
   @BindView(R.id.due_date)
   Spinner dueDateSpinner;
diff --git a/app/src/main/java/org/tasks/ui/SubtaskControlSet.java b/app/src/main/java/org/tasks/ui/SubtaskControlSet.java
index 6363922ff..29c8dab03 100644
--- a/app/src/main/java/org/tasks/ui/SubtaskControlSet.java
+++ b/app/src/main/java/org/tasks/ui/SubtaskControlSet.java
@@ -169,6 +169,7 @@ public class SubtaskControlSet extends TaskEditControlFragment implements Callba
       if (Strings.isNullOrEmpty(subtask.getTitle())) {
         continue;
       }
+      subtask.setCompletionDate(task.getCompletionDate());
       taskDao.createNew(subtask);
       if (remoteList instanceof GtasksFilter) {
         GoogleTask googleTask =