mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-01 09:16:00 +00:00
Code Issues Releases Wiki Activity

Debug threading

Browse source
This commit is contained in:
M66B 2024-08-08 22:33:34 +02:00
parent a097241fc1
commit d58f9c989f
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/MessageHelper.java
View file

@ -1740,8 +1740,11 @@ public class MessageHelper {
for (String ref : refs) for (String ref : refs)
before.addAll(db.message().getMessagesByMsgId(account, ref)); before.addAll(db.message().getMessagesByMsgId(account, ref));
String origin = null;
for (EntityMessage message : before) for (EntityMessage message : before)
if (!TextUtils.isEmpty(message.thread)) { if (!TextUtils.isEmpty(message.thread)) {
origin = "before";
thread = message.thread; thread = message.thread;
break; break;
} }
@ -1750,6 +1753,7 @@ public class MessageHelper {
List<EntityMessage> similar = db.message().getMessagesByMsgId(account, msgid); List<EntityMessage> similar = db.message().getMessagesByMsgId(account, msgid);
for (EntityMessage message : similar) for (EntityMessage message : similar)
if (!TextUtils.isEmpty(message.thread) && Objects.equals(message.hash, getHash())) { if (!TextUtils.isEmpty(message.thread) && Objects.equals(message.hash, getHash())) {
origin = "similar";
thread = message.thread; thread = message.thread;
break; break;
} }
@ -1758,23 +1762,27 @@ public class MessageHelper {
// Common reference // Common reference
if (thread == null && refs.size() > 0) { if (thread == null && refs.size() > 0) {
String ref = refs.get(0); String ref = refs.get(0);
if (!Objects.equals(ref, msgid)) if (!Objects.equals(ref, msgid)) {
origin = "common";
thread = ref; thread = ref;
} }
}
if (thread == null) if (thread == null) {
origin = "hash";
thread = getHash() + ":" + uid; thread = getHash() + ":" + uid;
}
for (EntityMessage message : before) for (EntityMessage message : before)
if (!thread.equals(message.thread)) { if (!thread.equals(message.thread)) {
Log.w("Updating before thread from " + message.thread + " to " + thread); Log.w("Updating before thread from " + message.thread + " to " + thread + " origin=" + origin);
db.message().updateMessageThread(message.account, message.thread, thread, null); db.message().updateMessageThread(message.account, message.thread, thread, null);
} }
List<EntityMessage> after = db.message().getMessagesByInReplyTo(account, msgid); List<EntityMessage> after = db.message().getMessagesByInReplyTo(account, msgid);
for (EntityMessage message : after) for (EntityMessage message : after)
if (!thread.equals(message.thread)) { if (!thread.equals(message.thread)) {
Log.w("Updating after thread from " + message.thread + " to " + thread); Log.w("Updating after thread from " + message.thread + " to " + thread + " origin=" + origin);
db.message().updateMessageThread(message.account, message.thread, thread, null); db.message().updateMessageThread(message.account, message.thread, thread, null);
} }