Skip to content

Commit a16a210

Browse files
committed
fix: better syncing, less work
1 parent 91bd4eb commit a16a210

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

app/src/main/java/tech/akpmakes/android/taskkeeper/TaskViewActivity.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import tech.akpmakes.android.taskkeeper.models.WhenEvent;
2828

2929
public class TaskViewActivity extends AppCompatActivity implements DatePickerDialog.OnDateSetListener, TimePickerDialog.OnTimeSetListener {
30-
Calendar whenTime;
30+
final Calendar whenTime = Calendar.getInstance();
3131
EditText taskName;
3232
TextView taskDate;
3333
TextView taskTime;
@@ -43,8 +43,6 @@ protected void onCreate(Bundle savedInstanceState) {
4343
taskTime = findViewById(R.id.task_when_time);
4444
useCurrentTime = findViewById(R.id.useCurrentTime);
4545

46-
whenTime = Calendar.getInstance();
47-
4846
final Handler handler = new Handler();
4947
handler.postDelayed(new Runnable() {
5048
@Override
@@ -75,10 +73,7 @@ public void run() {
7573
taskDate.setOnClickListener(new View.OnClickListener() {
7674
@Override
7775
public void onClick(View view) {
78-
Calendar now = Calendar.getInstance();
79-
if(whenTime != null) {
80-
now = whenTime;
81-
}
76+
Calendar now = whenTime;
8277
DatePickerDialog datePicker = DatePickerDialog.newInstance(
8378
TaskViewActivity.this,
8479
now.get(Calendar.YEAR),
@@ -91,10 +86,7 @@ public void onClick(View view) {
9186
taskTime.setOnClickListener(new View.OnClickListener() {
9287
@Override
9388
public void onClick(View view) {
94-
Calendar now = Calendar.getInstance();
95-
if(whenTime != null) {
96-
now = whenTime;
97-
}
89+
Calendar now = whenTime;
9890
TimePickerDialog timePicker = TimePickerDialog.newInstance(
9991
TaskViewActivity.this,
10092
now.get(Calendar.HOUR_OF_DAY),
@@ -119,7 +111,7 @@ private void saveTask() {
119111
updateTime();
120112
}
121113
String name = taskName.getText().toString();
122-
Long when = whenTime.getTimeInMillis();
114+
long when = whenTime.getTimeInMillis();
123115
if (name.length() == 0) {
124116
taskName.setError("Task name is required!");
125117
return;
@@ -176,7 +168,7 @@ public void onTimeSet(TimePickerDialog view, int hourOfDay, int minute, int seco
176168
}
177169

178170
private void updateTime() {
179-
whenTime = Calendar.getInstance();
171+
whenTime.setTimeInMillis(System.currentTimeMillis());
180172
updateDateTimeUI();
181173
}
182174

app/src/main/java/tech/akpmakes/android/taskkeeper/firebase/WhenEventViewHolder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ private long delay() {
4848
}
4949

5050
private void draw() {
51+
final long now = System.currentTimeMillis();
5152
String extra = "";
52-
if(this.when > new Date().getTime()) {
53+
if(this.when > now) {
5354
extra = "+";
5455
}
55-
this.whenText.setText(millisToShortDHMS(new Date().getTime() - this.when, extra));
56+
this.whenText.setText(millisToShortDHMS(now - this.when, extra));
5657
}
5758

5859
public void setName(String name) {

0 commit comments

Comments
 (0)