mirror of https://github.com/M66B/FairEmail.git
parent
2cfba13287
commit
84189816ec
|
@ -82,10 +82,11 @@ public interface DaoMessage {
|
||||||
|
|
||||||
@Query("SELECT message.* FROM message" +
|
@Query("SELECT message.* FROM message" +
|
||||||
" JOIN folder ON folder.id = message.folder" +
|
" JOIN folder ON folder.id = message.folder" +
|
||||||
" WHERE msgid = :msgid" +
|
" WHERE message.account = :account" +
|
||||||
|
" AND message.msgid = :msgid" +
|
||||||
" AND folder.type <> '" + EntityFolder.INBOX + "'" +
|
" AND folder.type <> '" + EntityFolder.INBOX + "'" +
|
||||||
" AND folder.type <> '" + EntityFolder.ARCHIVE + "'")
|
" AND folder.type <> '" + EntityFolder.ARCHIVE + "'")
|
||||||
List<EntityMessage> getMessageByMsgId(String msgid);
|
List<EntityMessage> getMessageByMsgId(long account, String msgid);
|
||||||
|
|
||||||
@Query("SELECT message.* FROM message" +
|
@Query("SELECT message.* FROM message" +
|
||||||
" JOIN folder ON folder.id = message.folder" +
|
" JOIN folder ON folder.id = message.folder" +
|
||||||
|
|
|
@ -1225,7 +1225,7 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
if (message == null) {
|
if (message == null) {
|
||||||
// Will fetch headers within database transaction
|
// Will fetch headers within database transaction
|
||||||
String msgid = helper.getMessageID();
|
String msgid = helper.getMessageID();
|
||||||
for (EntityMessage dup : db.message().getMessageByMsgId(msgid)) {
|
for (EntityMessage dup : db.message().getMessageByMsgId(folder.account, msgid)) {
|
||||||
EntityFolder dfolder = db.folder().getFolder(dup.folder);
|
EntityFolder dfolder = db.folder().getFolder(dup.folder);
|
||||||
Log.i(Helper.TAG, folder.name + " found as id=" + dup.id +
|
Log.i(Helper.TAG, folder.name + " found as id=" + dup.id +
|
||||||
" folder=" + dfolder.type + ":" + dup.folder + "/" + folder.type + ":" + folder.id);
|
" folder=" + dfolder.type + ":" + dup.folder + "/" + folder.type + ":" + folder.id);
|
||||||
|
|
Loading…
Reference in New Issue