mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Small fix

This commit is contained in:
M66B 2022-10-11 08:41:44 +02:00
parent 76052e1560
commit a72b72d3f7
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/Core.java
View File

@ -2929,7 +2929,7 @@ class Core {
MessageHelper helper = new MessageHelper((MimeMessage) imessages[imessages.length - 1], context);
String msgid = helper.getMessageID();
if (msgid != null) {
int count = db.message().countMessageByMsgId(folder.id, msgid);
int count = db.message().countMessageByMsgId(folder.id, msgid, true);
if (count == 1) {
Log.i(account.name + " POP having last msgid=" + msgid);
sync = false;

5
app/src/main/java/eu/faircode/email/DaoMessage.java
View File

@ -452,8 +452,9 @@ public interface DaoMessage {
@Query("SELECT COUNT(*) FROM message" +
" WHERE folder = :folder" +
" AND msgid = :msgid")
int countMessageByMsgId(long folder, String msgid);
" AND msgid = :msgid" +
" AND (:hidden OR NOT message.ui_hide)")
int countMessageByMsgId(long folder, String msgid, boolean hidden);
@Query("SELECT COUNT(*) FROM message" +
" JOIN folder_view AS folder ON folder.id = message.folder" +

2
app/src/main/java/eu/faircode/email/EntityOperation.java
View File

@ -334,7 +334,7 @@ public class EntityOperation {
if (premove &&
message.uid != null &&
!TextUtils.isEmpty(message.msgid) &&
db.message().countMessageByMsgId(target.id, message.msgid) == 0) {
db.message().countMessageByMsgId(target.id, message.msgid, false) == 0) {
File msource = message.getFile(context);
// Copy message to target folder