From 64d1e39c8cfcd3f75410e7c9799e52fc663682b4 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 24 Mar 2023 11:31:54 +0100 Subject: [PATCH] Refactoring --- app/src/main/java/eu/faircode/email/DaoOperation.java | 2 +- app/src/main/java/eu/faircode/email/EntityOperation.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java index c84844db67..7b95b66b8f 100644 --- a/app/src/main/java/eu/faircode/email/DaoOperation.java +++ b/app/src/main/java/eu/faircode/email/DaoOperation.java @@ -170,5 +170,5 @@ public interface DaoOperation { int deleteOperation(long id); @Query("DELETE FROM operation WHERE folder = :folder AND name = :name") - int deleteOperation(long folder, String name); + int deleteOperations(long folder, String name); } diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java index 4466a55ee2..c32b0ed079 100644 --- a/app/src/main/java/eu/faircode/email/EntityOperation.java +++ b/app/src/main/java/eu/faircode/email/EntityOperation.java @@ -739,7 +739,7 @@ public class EntityOperation { break; } - int count = db.operation().deleteOperation(fid, SYNC); + int count = db.operation().deleteOperations(fid, SYNC); Map crumb = new HashMap<>(); crumb.put("folder", Long.toString(fid)); @@ -776,7 +776,7 @@ public class EntityOperation { } if (force) - db.operation().deleteOperation(fid, SYNC); + db.operation().deleteOperations(fid, SYNC); // TODO: replace sync parameters? if (db.operation().getOperationCount(fid, SYNC) == 0) { @@ -848,7 +848,7 @@ public class EntityOperation { try { JSONArray jargs = new JSONArray(args); long target = jargs.getLong(0); - db.operation().deleteOperation(target, PURGE); + db.operation().deleteOperations(target, PURGE); } catch (Throwable ex) { Log.e(ex); } @@ -885,7 +885,7 @@ public class EntityOperation { } if (MOVE.equals(name)) { - int count = db.operation().deleteOperation(folder, PURGE); + int count = db.operation().deleteOperations(folder, PURGE); if (count > 0) sync(context, folder, false); }