diff --git a/app/src/main/java/eu/faircode/email/AdapterOperation.java b/app/src/main/java/eu/faircode/email/AdapterOperation.java index 51a56ab9d6..82f0589224 100644 --- a/app/src/main/java/eu/faircode/email/AdapterOperation.java +++ b/app/src/main/java/eu/faircode/email/AdapterOperation.java @@ -52,6 +52,7 @@ public class AdapterOperation extends RecyclerView.Adapter queue = new ArrayList<>(); static void queue(DB db, EntityMessage message, String name) { - JSONArray jsonArray = new JSONArray(); - queue(db, message, name, jsonArray); + JSONArray jargs = new JSONArray(); + queue(db, message, name, jargs); } static void queue(DB db, EntityMessage message, String name, Object value) { - JSONArray jsonArray = new JSONArray(); - jsonArray.put(value); - queue(db, message, name, jsonArray); + JSONArray jargs = new JSONArray(); + jargs.put(value); + queue(db, message, name, jargs); } static void queue(DB db, EntityMessage message, String name, Object value1, Object value2) { - JSONArray jsonArray = new JSONArray(); - jsonArray.put(value1); - jsonArray.put(value2); - queue(db, message, name, jsonArray); + JSONArray jargs = new JSONArray(); + jargs.put(value1); + jargs.put(value2); + queue(db, message, name, jargs); } - private static void queue(DB db, EntityMessage message, String name, JSONArray jsonArray) { + private static void queue(DB db, EntityMessage message, String name, JSONArray jargs) { EntityOperation operation = new EntityOperation(); operation.folder = message.folder; operation.message = message.id; operation.name = name; - operation.args = jsonArray.toString(); + operation.args = jargs.toString(); operation.created = new Date().getTime(); operation.id = db.operation().insertOperation(operation); @@ -137,7 +137,8 @@ public class EntityOperation { return (this.folder.equals(other.folder) && this.message.equals(other.message) && this.name.equals(other.name) && - this.args.equals(other.args)); + this.args.equals(other.args) && + this.created.equals(other.created)); } else return false; } diff --git a/app/src/main/res/layout/item_operation.xml b/app/src/main/res/layout/item_operation.xml index 6ab7587c6c..2dcce1eb36 100644 --- a/app/src/main/res/layout/item_operation.xml +++ b/app/src/main/res/layout/item_operation.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="3dp" - android:layout_marginTop="3dp"> + android:layout_marginTop="3dp" + android:layout_marginBottom="3dp"> + + + \ No newline at end of file