Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-02 07:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Limit thread search range

Browse Source
This commit is contained in:
M66B
2022-03-09 17:35:19 +01:00
parent 88d4b5cf66
commit e5ec014a6a
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -141,6 +141,7 @@ public class MessageHelper {
static final int DEFAULT_DOWNLOAD_SIZE = 4 * 1024 * 1024; // bytes
static final String HEADER_CORRELATION_ID = "X-Correlation-ID";
static final int MAX_SUBJECT_AGE = 48; // hours
static final long MAX_THREAD_AGE = 180; // days
static final List<String> RECEIVED_WORDS = Collections.unmodifiableList(Arrays.asList(
"from", "by", "via", "with", "id", "for"
@@ -1334,10 +1335,10 @@ public class MessageHelper {
return reportHeaders;
}
String getThreadId(Context context, long account, long folder, long uid) throws MessagingException {
String getThreadId(Context context, long account, long folder, long uid, long received) throws MessagingException {
if (threadId == null)
if (true)
threadId = _getThreadIdAlt(context, account, folder, uid);
threadId = _getThreadIdAlt(context, account, folder, uid, received);
else
threadId = _getThreadId(context, account, folder, uid);
return threadId;
@@ -1429,7 +1430,7 @@ public class MessageHelper {
return thread;
}
private String _getThreadIdAlt(Context context, long account, long folder, long uid) throws MessagingException {
private String _getThreadIdAlt(Context context, long account, long folder, long uid, long received) throws MessagingException {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
if (imessage instanceof GmailMessage) {
@@ -1483,9 +1484,10 @@ public class MessageHelper {
List<String> all = new ArrayList<>(refs);
all.add(msgid);
Long range = (received == 0 ? null : received - MAX_THREAD_AGE * 24 * 3600L);
List<TupleThreadInfo> infos = (all.size() == 0
? new ArrayList<>()
: db.message().getThreadInfo(account, all));
: db.message().getThreadInfo(account, all, range));
// References, In-Reply-To (sent before)
for (TupleThreadInfo info : infos)