diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
index 640e710f05..baf04f6331 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
@@ -61,6 +61,7 @@ public class FragmentDialogDuration extends FragmentDialogBase {
final TextView tvDuration = dview.findViewById(R.id.tvDuration);
final Button btn1hour = dview.findViewById(R.id.btn1hour);
final Button btn1day = dview.findViewById(R.id.btn1day);
+ final Button btn1week = dview.findViewById(R.id.btn1week);
final TimePicker timePicker = dview.findViewById(R.id.timePicker);
final DatePicker datePicker = dview.findViewById(R.id.datePicker);
@@ -114,13 +115,18 @@ public class FragmentDialogDuration extends FragmentDialogBase {
})
.create();
- btn1hour.setOnClickListener(new View.OnClickListener() {
+ View.OnClickListener buttonListener = new View.OnClickListener() {
@Override
public void onClick(View view) {
dialog.dismiss();
long now = new Date().getTime();
+
long duration = 3600 * 1000L;
+ if (view.getId() != R.id.btn1hour)
+ duration *= 24;
+ if (view.getId() == R.id.btn1week)
+ duration *= 7;
Bundle args = getArguments();
args.putLong("duration", duration);
@@ -128,23 +134,11 @@ public class FragmentDialogDuration extends FragmentDialogBase {
sendResult(RESULT_OK);
}
- });
+ };
- btn1day.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- dialog.dismiss();
-
- long now = new Date().getTime();
- long duration = 24 * 3600 * 1000L;
-
- Bundle args = getArguments();
- args.putLong("duration", duration);
- args.putLong("time", now + duration);
-
- sendResult(RESULT_OK);
- }
- });
+ btn1hour.setOnClickListener(buttonListener);
+ btn1day.setOnClickListener(buttonListener);
+ btn1week.setOnClickListener(buttonListener);
timePicker.setOnTimeChangedListener(new TimePicker.OnTimeChangedListener() {
@Override
diff --git a/app/src/main/res/layout/dialog_duration.xml b/app/src/main/res/layout/dialog_duration.xml
index 76c34d429f..4f332fbf3c 100644
--- a/app/src/main/res/layout/dialog_duration.xml
+++ b/app/src/main/res/layout/dialog_duration.xml
@@ -43,10 +43,23 @@
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_1day"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/btn1week"
app:layout_constraintStart_toEndOf="@id/btn1hour"
app:layout_constraintTop_toBottomOf="@id/tvDuration" />
+
+
Via: %1$s
1 hour
1 day
+ 1 week
Now
After %1$s
Reset