Don't use task completer for new tasks

gtask_related_email 7.4.1
Alex Baker 6 years ago
parent ae739053e5
commit 19febfb54f

@ -36,7 +36,7 @@ android {
defaultConfig { defaultConfig {
testApplicationId = "org.tasks.test" testApplicationId = "org.tasks.test"
applicationId = "org.tasks" applicationId = "org.tasks"
versionCode = 643 versionCode = 644
versionName = "7.4.1" versionName = "7.4.1"
targetSdkVersion(Versions.targetSdk) targetSdkVersion(Versions.targetSdk)
minSdkVersion(Versions.minSdk) minSdkVersion(Versions.minSdk)

@ -4,7 +4,6 @@ import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Lists.transform; import static com.google.common.collect.Lists.transform;
import static com.todoroo.andlib.utility.DateUtilities.now; import static com.todoroo.andlib.utility.DateUtilities.now;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import com.todoroo.astrid.api.CaldavFilter; import com.todoroo.astrid.api.CaldavFilter;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;

@ -6,6 +6,8 @@
package com.todoroo.astrid.ui; package com.todoroo.astrid.ui;
import static com.todoroo.andlib.utility.DateUtilities.now;
import android.content.Context; import android.content.Context;
import android.graphics.Paint; import android.graphics.Paint;
import android.os.Bundle; import android.os.Bundle;
@ -176,7 +178,9 @@ public class EditTitleControlSet extends TaskEditControlFragment {
@Override @Override
public void apply(Task task) { public void apply(Task task) {
task.setTitle(Strings.isNullOrEmpty(title) ? getString(R.string.no_title) : title); 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); taskCompleter.setComplete(task, isComplete);
} }
} }

@ -37,7 +37,6 @@ import org.tasks.activities.TimePickerActivity;
import org.tasks.injection.ForActivity; import org.tasks.injection.ForActivity;
import org.tasks.injection.FragmentComponent; import org.tasks.injection.FragmentComponent;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
import org.tasks.themes.ThemeBase;
import org.tasks.time.DateTime; import org.tasks.time.DateTime;
public class DeadlineControlSet extends TaskEditControlFragment { public class DeadlineControlSet extends TaskEditControlFragment {
@ -50,7 +49,6 @@ public class DeadlineControlSet extends TaskEditControlFragment {
private static final String EXTRA_TIME = "extra_time"; private static final String EXTRA_TIME = "extra_time";
@Inject Preferences preferences; @Inject Preferences preferences;
@Inject @ForActivity Context context; @Inject @ForActivity Context context;
@Inject ThemeBase themeBase;
@BindView(R.id.due_date) @BindView(R.id.due_date)
Spinner dueDateSpinner; Spinner dueDateSpinner;

@ -169,6 +169,7 @@ public class SubtaskControlSet extends TaskEditControlFragment implements Callba
if (Strings.isNullOrEmpty(subtask.getTitle())) { if (Strings.isNullOrEmpty(subtask.getTitle())) {
continue; continue;
} }
subtask.setCompletionDate(task.getCompletionDate());
taskDao.createNew(subtask); taskDao.createNew(subtask);
if (remoteList instanceof GtasksFilter) { if (remoteList instanceof GtasksFilter) {
GoogleTask googleTask = GoogleTask googleTask =

Loading…
Cancel
Save