mirror of https://github.com/M66B/FairEmail.git
Refactoring
This commit is contained in:
parent
e046e0f7cf
commit
ceee4166de
|
@ -1486,7 +1486,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
|
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
if (message != null) {
|
if (message != null) {
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, threading ? null : id, null);
|
message.account, message.thread, threading ? null : id, null);
|
||||||
for (EntityMessage threaded : messages)
|
for (EntityMessage threaded : messages)
|
||||||
if (threaded.ui_seen == message.ui_seen)
|
if (threaded.ui_seen == message.ui_seen)
|
||||||
|
@ -1564,7 +1564,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
if (message == null)
|
if (message == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, threading && thread ? null : id, null);
|
message.account, message.thread, threading && thread ? null : id, null);
|
||||||
for (EntityMessage threaded : messages)
|
for (EntityMessage threaded : messages)
|
||||||
EntityOperation.queue(context, threaded, EntityOperation.FLAG, flagged);
|
EntityOperation.queue(context, threaded, EntityOperation.FLAG, flagged);
|
||||||
|
|
|
@ -223,7 +223,7 @@ public interface DaoMessage {
|
||||||
" AND (:folder IS NULL OR message.folder = :folder)" +
|
" AND (:folder IS NULL OR message.folder = :folder)" +
|
||||||
" AND NOT uid IS NULL" +
|
" AND NOT uid IS NULL" +
|
||||||
" AND ui_hide = 0")
|
" AND ui_hide = 0")
|
||||||
List<EntityMessage> getMessageByThread(long account, String thread, Long id, Long folder);
|
List<EntityMessage> getMessagesByThread(long account, String thread, Long id, Long folder);
|
||||||
|
|
||||||
@Query("SELECT * FROM message" +
|
@Query("SELECT * FROM message" +
|
||||||
" WHERE account = :account" +
|
" WHERE account = :account" +
|
||||||
|
|
|
@ -239,7 +239,7 @@ public class EntityRule {
|
||||||
if (folder == null)
|
if (folder == null)
|
||||||
throw new IllegalArgumentException("Rule move to folder not found");
|
throw new IllegalArgumentException("Rule move to folder not found");
|
||||||
|
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, thread ? null : message.id, message.folder);
|
message.account, message.thread, thread ? null : message.id, message.folder);
|
||||||
for (EntityMessage threaded : messages)
|
for (EntityMessage threaded : messages)
|
||||||
EntityOperation.queue(context, threaded, EntityOperation.MOVE, target, seen);
|
EntityOperation.queue(context, threaded, EntityOperation.MOVE, target, seen);
|
||||||
|
|
|
@ -606,7 +606,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
EntityFolder target = db.folder().getFolderByType(aid, type);
|
EntityFolder target = db.folder().getFolderByType(aid, type);
|
||||||
if (target != null) {
|
if (target != null) {
|
||||||
EntityAccount account = db.account().getAccount(target.account);
|
EntityAccount account = db.account().getAccount(target.account);
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
aid, thread, threading ? null : id, null);
|
aid, thread, threading ? null : id, null);
|
||||||
for (EntityMessage threaded : messages) {
|
for (EntityMessage threaded : messages) {
|
||||||
EntityFolder folder = db.folder().getFolder(threaded.folder);
|
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);
|
EntityAccount account = db.account().getAccount(target.account);
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
if (message != null) {
|
if (message != null) {
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, threading && thread ? null : id, message.folder);
|
message.account, message.thread, threading && thread ? null : id, message.folder);
|
||||||
for (EntityMessage threaded : messages) {
|
for (EntityMessage threaded : messages) {
|
||||||
result.add(new MessageTarget(threaded, account, target));
|
result.add(new MessageTarget(threaded, account, target));
|
||||||
|
@ -1531,7 +1531,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
if (!result.folders.contains(message.folder))
|
if (!result.folders.contains(message.folder))
|
||||||
result.folders.add(message.folder);
|
result.folders.add(message.folder);
|
||||||
|
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, threading ? null : id, null);
|
message.account, message.thread, threading ? null : id, null);
|
||||||
for (EntityMessage threaded : messages) {
|
for (EntityMessage threaded : messages) {
|
||||||
if (threaded.ui_seen)
|
if (threaded.ui_seen)
|
||||||
|
@ -1702,7 +1702,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
for (long id : ids) {
|
for (long id : ids) {
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
if (message != null) {
|
if (message != null) {
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, threading ? null : id, null);
|
message.account, message.thread, threading ? null : id, null);
|
||||||
for (EntityMessage threaded : messages)
|
for (EntityMessage threaded : messages)
|
||||||
if (threaded.ui_seen != seen)
|
if (threaded.ui_seen != seen)
|
||||||
|
@ -1758,7 +1758,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
for (long id : ids) {
|
for (long id : ids) {
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
if (message != null) {
|
if (message != null) {
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, threading ? null : id, null);
|
message.account, message.thread, threading ? null : id, null);
|
||||||
for (EntityMessage threaded : messages)
|
for (EntityMessage threaded : messages)
|
||||||
if (threaded.ui_flagged != flagged)
|
if (threaded.ui_flagged != flagged)
|
||||||
|
@ -1869,7 +1869,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
for (long id : ids) {
|
for (long id : ids) {
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
if (message != null) {
|
if (message != null) {
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, threading ? null : id, message.folder);
|
message.account, message.thread, threading ? null : id, message.folder);
|
||||||
for (EntityMessage threaded : messages) {
|
for (EntityMessage threaded : messages) {
|
||||||
EntityFolder target = db.folder().getFolderByType(message.account, type);
|
EntityFolder target = db.folder().getFolderByType(message.account, type);
|
||||||
|
@ -1937,7 +1937,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
for (long id : ids) {
|
for (long id : ids) {
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
if (message != null) {
|
if (message != null) {
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, threading ? null : id, message.folder);
|
message.account, message.thread, threading ? null : id, message.folder);
|
||||||
for (EntityMessage threaded : messages)
|
for (EntityMessage threaded : messages)
|
||||||
result.add(new MessageTarget(threaded, account, target));
|
result.add(new MessageTarget(threaded, account, target));
|
||||||
|
@ -2953,7 +2953,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
|
|
||||||
DB db = DB.getInstance(context);
|
DB db = DB.getInstance(context);
|
||||||
|
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
account, thread, threading ? null : id, null);
|
account, thread, threading ? null : id, null);
|
||||||
|
|
||||||
boolean trashable = false;
|
boolean trashable = false;
|
||||||
|
@ -4112,7 +4112,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
try {
|
try {
|
||||||
db.beginTransaction();
|
db.beginTransaction();
|
||||||
|
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
account, thread, threading ? null : id, null);
|
account, thread, threading ? null : id, null);
|
||||||
for (EntityMessage threaded : messages) {
|
for (EntityMessage threaded : messages) {
|
||||||
db.message().setMessageSnoozed(threaded.id, wakeup);
|
db.message().setMessageSnoozed(threaded.id, wakeup);
|
||||||
|
@ -4170,7 +4170,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
for (long id : ids) {
|
for (long id : ids) {
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
if (message != null) {
|
if (message != null) {
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, threading ? null : id, message.folder);
|
message.account, message.thread, threading ? null : id, message.folder);
|
||||||
for (EntityMessage threaded : messages) {
|
for (EntityMessage threaded : messages) {
|
||||||
db.message().setMessageSnoozed(threaded.id, wakeup);
|
db.message().setMessageSnoozed(threaded.id, wakeup);
|
||||||
|
@ -4216,7 +4216,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
||||||
if (copy)
|
if (copy)
|
||||||
throw new IllegalArgumentException();
|
throw new IllegalArgumentException();
|
||||||
else {
|
else {
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, threading ? null : id, message.folder);
|
message.account, message.thread, threading ? null : id, message.folder);
|
||||||
for (EntityMessage threaded : messages)
|
for (EntityMessage threaded : messages)
|
||||||
EntityOperation.queue(context, threaded, EntityOperation.MOVE, target);
|
EntityOperation.queue(context, threaded, EntityOperation.MOVE, target);
|
||||||
|
|
|
@ -177,7 +177,7 @@ public class ServiceUI extends IntentService {
|
||||||
|
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
if (message != null) {
|
if (message != null) {
|
||||||
List<EntityMessage> messages = db.message().getMessageByThread(
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
||||||
message.account, message.thread, threading ? null : id, null);
|
message.account, message.thread, threading ? null : id, null);
|
||||||
for (EntityMessage threaded : messages) {
|
for (EntityMessage threaded : messages) {
|
||||||
EntityOperation.queue(this, threaded, EntityOperation.FLAG, true);
|
EntityOperation.queue(this, threaded, EntityOperation.FLAG, true);
|
||||||
|
|
Loading…
Reference in New Issue