Fixed rule move/seen

pull/162/head
M66B 6 years ago
parent 94c0708e26
commit b520845a0a

@ -194,7 +194,7 @@ class Core {
case EntityOperation.MOVE: case EntityOperation.MOVE:
if (EntityOperation.MOVE.equals(next.name)) { if (EntityOperation.MOVE.equals(next.name)) {
JSONArray jnext = new JSONArray(next.args); JSONArray jnext = new JSONArray(next.args);
// Same target, autoread // Same target
if (jargs.getLong(0) == jnext.getLong(0)) { if (jargs.getLong(0) == jnext.getLong(0)) {
EntityMessage m = db.message().getMessage(next.message); EntityMessage m = db.message().getMessage(next.message);
if (m != null) { if (m != null) {

@ -140,13 +140,16 @@ public class EntityOperation {
else if (MOVE.equals(name)) { else if (MOVE.equals(name)) {
// Parameters: // Parameters:
// 0: target folder // 0: target folder
// (1: auto read) // 1: mark read (rule)
// 2: temporary message // 2: temporary message
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean autoread = prefs.getBoolean("autoread", false); boolean autoread = prefs.getBoolean("autoread", false);
boolean autounflag = prefs.getBoolean("autounflag", false); boolean autounflag = prefs.getBoolean("autounflag", false);
if (jargs.optBoolean(1))
autoread = true;
EntityFolder source = db.folder().getFolder(message.folder); EntityFolder source = db.folder().getFolder(message.folder);
EntityFolder target = db.folder().getFolder(jargs.getLong(0)); EntityFolder target = db.folder().getFolder(jargs.getLong(0));
if (source.id.equals(target.id)) if (source.id.equals(target.id))

Loading…
Cancel
Save