From ceee4166de216997987fcf4b1d974c8b9f3fb2ef Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 25 Jul 2019 15:38:14 +0200 Subject: [PATCH] Refactoring --- .../eu/faircode/email/AdapterMessage.java | 4 ++-- .../java/eu/faircode/email/DaoMessage.java | 2 +- .../java/eu/faircode/email/EntityRule.java | 2 +- .../eu/faircode/email/FragmentMessages.java | 22 +++++++++---------- .../java/eu/faircode/email/ServiceUI.java | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java index 9e4c5e99ce..0f1b8fcf1f 100644 --- a/app/src/main/java/eu/faircode/email/AdapterMessage.java +++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java @@ -1486,7 +1486,7 @@ public class AdapterMessage extends RecyclerView.Adapter messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, threading ? null : id, null); for (EntityMessage threaded : messages) if (threaded.ui_seen == message.ui_seen) @@ -1564,7 +1564,7 @@ public class AdapterMessage extends RecyclerView.Adapter messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, threading && thread ? null : id, null); for (EntityMessage threaded : messages) EntityOperation.queue(context, threaded, EntityOperation.FLAG, flagged); diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index 5e783b28b7..b38a8c8ccd 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -223,7 +223,7 @@ public interface DaoMessage { " AND (:folder IS NULL OR message.folder = :folder)" + " AND NOT uid IS NULL" + " AND ui_hide = 0") - List getMessageByThread(long account, String thread, Long id, Long folder); + List getMessagesByThread(long account, String thread, Long id, Long folder); @Query("SELECT * FROM message" + " WHERE account = :account" + diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java index d11b08e45d..45bfa8ffd6 100644 --- a/app/src/main/java/eu/faircode/email/EntityRule.java +++ b/app/src/main/java/eu/faircode/email/EntityRule.java @@ -239,7 +239,7 @@ public class EntityRule { if (folder == null) throw new IllegalArgumentException("Rule move to folder not found"); - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, thread ? null : message.id, message.folder); for (EntityMessage threaded : messages) EntityOperation.queue(context, threaded, EntityOperation.MOVE, target, seen); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 16dbf564e3..4219f455be 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -606,7 +606,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. EntityFolder target = db.folder().getFolderByType(aid, type); if (target != null) { EntityAccount account = db.account().getAccount(target.account); - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( aid, thread, threading ? null : id, null); for (EntityMessage threaded : messages) { EntityFolder folder = db.folder().getFolder(threaded.folder); @@ -1475,7 +1475,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. EntityAccount account = db.account().getAccount(target.account); EntityMessage message = db.message().getMessage(id); if (message != null) { - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, threading && thread ? null : id, message.folder); for (EntityMessage threaded : messages) { result.add(new MessageTarget(threaded, account, target)); @@ -1531,7 +1531,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (!result.folders.contains(message.folder)) result.folders.add(message.folder); - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, threading ? null : id, null); for (EntityMessage threaded : messages) { if (threaded.ui_seen) @@ -1702,7 +1702,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. for (long id : ids) { EntityMessage message = db.message().getMessage(id); if (message != null) { - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, threading ? null : id, null); for (EntityMessage threaded : messages) if (threaded.ui_seen != seen) @@ -1758,7 +1758,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. for (long id : ids) { EntityMessage message = db.message().getMessage(id); if (message != null) { - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, threading ? null : id, null); for (EntityMessage threaded : messages) if (threaded.ui_flagged != flagged) @@ -1869,7 +1869,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. for (long id : ids) { EntityMessage message = db.message().getMessage(id); if (message != null) { - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, threading ? null : id, message.folder); for (EntityMessage threaded : messages) { EntityFolder target = db.folder().getFolderByType(message.account, type); @@ -1937,7 +1937,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. for (long id : ids) { EntityMessage message = db.message().getMessage(id); if (message != null) { - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, threading ? null : id, message.folder); for (EntityMessage threaded : messages) result.add(new MessageTarget(threaded, account, target)); @@ -2953,7 +2953,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. DB db = DB.getInstance(context); - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( account, thread, threading ? null : id, null); boolean trashable = false; @@ -4112,7 +4112,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. try { db.beginTransaction(); - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( account, thread, threading ? null : id, null); for (EntityMessage threaded : messages) { db.message().setMessageSnoozed(threaded.id, wakeup); @@ -4170,7 +4170,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. for (long id : ids) { EntityMessage message = db.message().getMessage(id); if (message != null) { - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, threading ? null : id, message.folder); for (EntityMessage threaded : messages) { db.message().setMessageSnoozed(threaded.id, wakeup); @@ -4216,7 +4216,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (copy) throw new IllegalArgumentException(); else { - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, threading ? null : id, message.folder); for (EntityMessage threaded : messages) EntityOperation.queue(context, threaded, EntityOperation.MOVE, target); diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java index 9e0942f27d..cf58c7e491 100644 --- a/app/src/main/java/eu/faircode/email/ServiceUI.java +++ b/app/src/main/java/eu/faircode/email/ServiceUI.java @@ -177,7 +177,7 @@ public class ServiceUI extends IntentService { EntityMessage message = db.message().getMessage(id); if (message != null) { - List messages = db.message().getMessageByThread( + List messages = db.message().getMessagesByThread( message.account, message.thread, threading ? null : id, null); for (EntityMessage threaded : messages) { EntityOperation.queue(this, threaded, EntityOperation.FLAG, true);