|
|
@ -246,10 +246,11 @@ public class EntityRule {
|
|
|
|
JSONObject jcondition = new JSONObject(condition);
|
|
|
|
JSONObject jcondition = new JSONObject(condition);
|
|
|
|
|
|
|
|
|
|
|
|
// general
|
|
|
|
// general
|
|
|
|
|
|
|
|
int age = 0;
|
|
|
|
if (this.daily) {
|
|
|
|
if (this.daily) {
|
|
|
|
JSONObject jgeneral = jcondition.optJSONObject("general");
|
|
|
|
JSONObject jgeneral = jcondition.optJSONObject("general");
|
|
|
|
if (jgeneral != null) {
|
|
|
|
if (jgeneral != null) {
|
|
|
|
int age = jgeneral.optInt("age");
|
|
|
|
age = jgeneral.optInt("age");
|
|
|
|
if (age > 0) {
|
|
|
|
if (age > 0) {
|
|
|
|
Calendar cal = Calendar.getInstance();
|
|
|
|
Calendar cal = Calendar.getInstance();
|
|
|
|
cal.setTimeInMillis(message.received);
|
|
|
|
cal.setTimeInMillis(message.received);
|
|
|
@ -505,7 +506,8 @@ public class EntityRule {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Safeguard
|
|
|
|
// Safeguard
|
|
|
|
if (jsender == null &&
|
|
|
|
if (age == 0 &&
|
|
|
|
|
|
|
|
jsender == null &&
|
|
|
|
jrecipient == null &&
|
|
|
|
jrecipient == null &&
|
|
|
|
jsubject == null &&
|
|
|
|
jsubject == null &&
|
|
|
|
!jcondition.optBoolean("attachments") &&
|
|
|
|
!jcondition.optBoolean("attachments") &&
|
|
|
|