Added mark read option to snooze rule

This commit is contained in:
M66B
2019-11-09 08:55:42 +01:00
parent 8e8b947b99
commit 0fd0aba645
3 changed files with 19 additions and 2 deletions

View File

@@ -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;
}

View File

@@ -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: