mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-03 13:44:40 +00:00
Code Issues Releases Wiki Activity

Simplification

Browse source
This commit is contained in:
M66B 2019-01-10 07:34:54 +00:00
parent bafcae35e9
commit 3a25fed941
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -722,6 +722,7 @@ public class FragmentCompose extends FragmentEx {
final NumberPicker npDays = dview.findViewById(R.id.npDays);
final TextView tvTime = dview.findViewById(R.id.tvTime);
final long HOUR_MS = 3600L * 1000L;
final long now = new Date().getTime() / HOUR_MS * HOUR_MS;
npHours.setMinValue(0);
npHours.setMaxValue(24);
@ -735,7 +736,7 @@ public class FragmentCompose extends FragmentEx {
int hours = npHours.getValue();
int days = npDays.getValue();
long duration = (hours + days * 24) * HOUR_MS;
long time = new Date().getTime() / HOUR_MS * HOUR_MS + duration;
long time = now + duration;
DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.MEDIUM, SimpleDateFormat.SHORT);
tvTime.setText(df.format(time));
tvTime.setVisibility(duration == 0 ? View.INVISIBLE : View.VISIBLE);
@ -756,7 +757,7 @@ public class FragmentCompose extends FragmentEx {
int hours = npHours.getValue();
int days = npDays.getValue();
long duration = (hours + days * 24) * HOUR_MS;
long time = new Date().getTime() / HOUR_MS * HOUR_MS + duration;
long time = now + duration;
Bundle args = new Bundle();
args.putLong("id", working);

5
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -1210,6 +1210,7 @@ public class FragmentMessages extends FragmentEx {
final NumberPicker npDays = dview.findViewById(R.id.npDays);
final TextView tvTime = dview.findViewById(R.id.tvTime);
final long HOUR_MS = 3600L * 1000L;
final long now = new Date().getTime() / HOUR_MS * HOUR_MS;
npHours.setMinValue(0);
npHours.setMaxValue(24);
@ -1223,7 +1224,7 @@ public class FragmentMessages extends FragmentEx {
int hours = npHours.getValue();
int days = npDays.getValue();
long duration = (hours + days * 24) * HOUR_MS;
long time = new Date().getTime() / HOUR_MS * HOUR_MS + duration;
long time = now + duration;
DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.MEDIUM, SimpleDateFormat.SHORT);
tvTime.setText(df.format(time));
tvTime.setVisibility(duration == 0 ? View.INVISIBLE : View.VISIBLE);
@ -1244,7 +1245,7 @@ public class FragmentMessages extends FragmentEx {
int hours = npHours.getValue();
int days = npDays.getValue();
long duration = (hours + days * 24) * HOUR_MS;
long time = new Date().getTime() / HOUR_MS * HOUR_MS + duration;
long time = now + duration;
Bundle args = new Bundle();
args.putLongArray("ids", getSelection());