mirror of
https://github.com/M66B/FairEmail.git
synced 2026-04-01 14:46:31 +02:00
Added mark read option to snooze rule
This commit is contained in:
@@ -454,6 +454,7 @@ public class EntityRule {
|
||||
private boolean onActionSnooze(Context context, EntityMessage message, JSONObject jargs) throws JSONException {
|
||||
int duration = jargs.getInt("duration");
|
||||
boolean schedule_end = jargs.optBoolean("schedule_end", false);
|
||||
boolean seen = jargs.optBoolean("seen", false);
|
||||
|
||||
long wakeup;
|
||||
if (schedule_end) {
|
||||
@@ -476,6 +477,9 @@ public class EntityRule {
|
||||
|
||||
message.ui_snoozed = wakeup;
|
||||
|
||||
if (seen)
|
||||
onActionSeen(context, message, true);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -112,6 +112,7 @@ public class FragmentRule extends FragmentBase {
|
||||
|
||||
private NumberPicker npDuration;
|
||||
private CheckBox cbScheduleEnd;
|
||||
private CheckBox cbSnoozeSeen;
|
||||
|
||||
private ViewButtonColor btnColor;
|
||||
|
||||
@@ -218,6 +219,7 @@ public class FragmentRule extends FragmentBase {
|
||||
|
||||
npDuration = view.findViewById(R.id.npDuration);
|
||||
cbScheduleEnd = view.findViewById(R.id.cbScheduleEnd);
|
||||
cbSnoozeSeen = view.findViewById(R.id.cbSnoozeSeen);
|
||||
|
||||
btnColor = view.findViewById(R.id.btnColor);
|
||||
|
||||
@@ -676,6 +678,7 @@ public class FragmentRule extends FragmentBase {
|
||||
case EntityRule.TYPE_SNOOZE:
|
||||
npDuration.setValue(jaction.optInt("duration", 0));
|
||||
cbScheduleEnd.setChecked(jaction.optBoolean("schedule_end", false));
|
||||
cbSnoozeSeen.setChecked(jaction.optBoolean("seen", false));
|
||||
break;
|
||||
|
||||
case EntityRule.TYPE_FLAG:
|
||||
@@ -969,6 +972,7 @@ public class FragmentRule extends FragmentBase {
|
||||
case EntityRule.TYPE_SNOOZE:
|
||||
jaction.put("duration", npDuration.getValue());
|
||||
jaction.put("schedule_end", cbScheduleEnd.isChecked());
|
||||
jaction.put("seen", cbSnoozeSeen.isChecked());
|
||||
break;
|
||||
|
||||
case EntityRule.TYPE_FLAG:
|
||||
|
||||
Reference in New Issue
Block a user