mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 15:11:03 +00:00
Code Issues Releases Wiki Activity

Revert "User is not reading messages"

Browse source 
This reverts commit 04908ca4bb.
This commit is contained in:
M66B 2023-12-07 08:50:00 +01:00
parent 533833a212
commit 814612ce8d
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/Core.java
View file

@ -3822,13 +3822,6 @@ class Core {
cal_keep.set(Calendar.SECOND, 0);
cal_keep.set(Calendar.MILLISECOND, 0);
Calendar cal_keep_unseen = Calendar.getInstance();
cal_keep_unseen.add(Calendar.DAY_OF_MONTH, -keep_days * 2);
cal_keep_unseen.set(Calendar.HOUR_OF_DAY, 0);
cal_keep_unseen.set(Calendar.MINUTE, 0);
cal_keep_unseen.set(Calendar.SECOND, 0);
cal_keep_unseen.set(Calendar.MILLISECOND, 0);
long sync_time = cal_sync.getTimeInMillis();
if (sync_time < 0)
sync_time = 0;
@ -3837,10 +3830,6 @@ class Core {
if (keep_time < 0)
keep_time = 0;
long keep_time_unseen = cal_keep_unseen.getTimeInMillis();
if (keep_time_unseen < 0)
keep_time_unseen = 0;
Log.i(folder.name + " sync=" + new Date(sync_time) + " keep=" + new Date(keep_time));
// Delete old local messages
@ -3859,7 +3848,7 @@ class Core {
EntityOperation.queue(context, message, EntityOperation.MOVE, trash.id);
}
} else {
int old = db.message().deleteMessagesBefore(folder.id, delete_time, keep_time, keep_time_unseen, delete_unseen);
int old = db.message().deleteMessagesBefore(folder.id, delete_time, keep_time, delete_unseen);
Log.i(folder.name + " local old=" + old);
}

4
app/src/main/java/eu/faircode/email/DaoMessage.java
View file

@ -1019,11 +1019,11 @@ public interface DaoMessage {
" WHERE folder = :folder" +
" AND received < :keep_time" +
" AND NOT uid IS NULL" +
" AND (ui_seen OR received < :keep_time_unseen OR :unseen)" +
" AND (ui_seen OR :unseen)" +
" AND NOT ui_flagged" +
" AND stored < :sync_time" + // moved, browsed
" AND (ui_snoozed IS NULL OR ui_snoozed = " + Long.MAX_VALUE + ")")
int deleteMessagesBefore(long folder, long sync_time, long keep_time, long keep_time_unseen, boolean unseen);
int deleteMessagesBefore(long folder, long sync_time, long keep_time, boolean unseen);
@Transaction
@Query("DELETE FROM message" +