From 7ff1ba5fbe9aa851f1e7d003c415c7463945ffcc Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Fri, 21 Aug 2015 14:54:18 -0500
Subject: [PATCH] Init due date and repeat pickers with prev value

---
 build.gradle                                         |  4 ++--
 .../com/todoroo/astrid/repeats/RepeatControlSet.java |  2 +-
 src/main/java/org/tasks/ui/DeadlineControlSet.java   | 12 ++++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0d75980f1..ce8c3319d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,8 +27,8 @@ android {
     buildToolsVersion "22.0.1"
 
     defaultConfig {
-        versionCode 374
-        versionName "4.7.18"
+        versionCode 375
+        versionName "4.7.19"
         minSdkVersion 7
         targetSdkVersion 22
     }
diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
index 0cd500ed2..e852dede1 100644
--- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -132,7 +132,7 @@ public class RepeatControlSet extends PopupControlSet {
 
     private void repeatUntilClick() {
         MyDatePickerDialog dialog = new MyDatePickerDialog();
-        DateTime initial = newDateTime();
+        DateTime initial = repeatUntilValue > 0 ? newDateTime(repeatUntilValue) : newDateTime();
         dialog.initialize(new DatePickerDialog.OnDateSetListener() {
             @Override
             public void onDateSet(DatePickerDialog datePickerDialog, int year, int month, int day) {
diff --git a/src/main/java/org/tasks/ui/DeadlineControlSet.java b/src/main/java/org/tasks/ui/DeadlineControlSet.java
index f1838e5f2..d2e894d87 100644
--- a/src/main/java/org/tasks/ui/DeadlineControlSet.java
+++ b/src/main/java/org/tasks/ui/DeadlineControlSet.java
@@ -311,12 +311,13 @@ public class DeadlineControlSet extends TaskEditControlSetBase {
                         break;
                     case 4:
                         MyDatePickerDialog dialog = new MyDatePickerDialog();
+                        DateTime initial = date > 0 ? newDateTime(date) : today;
                         dialog.initialize(new DatePickerDialog.OnDateSetListener() {
                             @Override
                             public void onDateSet(DatePickerDialog datePickerDialog, int year, int month, int day) {
                                 setDate(new DateTime(year, month + 1, day, 0, 0, 0, 0).getMillis());
                             }
-                        }, today.getYear(), today.getMonthOfYear() - 1, today.getDayOfMonth(), false);
+                        }, initial.getYear(), initial.getMonthOfYear() - 1, initial.getDayOfMonth(), false);
                         dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
                             @Override
                             public void onCancel(DialogInterface dialog) {
@@ -357,12 +358,19 @@ public class DeadlineControlSet extends TaskEditControlSetBase {
                         break;
                     case 6:
                         MyTimePickerDialog dialog = new MyTimePickerDialog();
+                        int initialHours = 0;
+                        int initialMinutes = 0;
+                        if (time >= 0) {
+                            DateTime initial = newDateTime(date).withMillisOfDay(time);
+                            initialHours = initial.getHourOfDay();
+                            initialMinutes = initial.getMinuteOfHour();
+                        }
                         dialog.initialize(new TimePickerDialog.OnTimeSetListener() {
                             @Override
                             public void onTimeSet(RadialPickerLayout radialPickerLayout, int hour, int minute) {
                                 setTime((int) TimeUnit.HOURS.toMillis(hour) + (int) TimeUnit.MINUTES.toMillis(minute));
                             }
-                        }, 0, 0, DateFormat.is24HourFormat(activity), false);
+                        }, initialHours, initialMinutes, DateFormat.is24HourFormat(activity), false);
                         dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
                             @Override
                             public void onDismiss(DialogInterface dialog) {