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

Same message has same hash

This commit is contained in:
M66B 2021-12-11 11:26:32 +01:00
parent 628a4709e3
commit 312aa299f7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,7 @@ public class MessageHelper {
private boolean ensuredHeaders = false;
private boolean ensuredStructure = false;
private MimeMessage imessage;
private String hash = null;
private static File cacheDir = null;
@ -1176,7 +1177,7 @@ public class MessageHelper {
if (thread == null) {
List<EntityMessage> similar = db.message().getMessagesByMsgId(account, msgid);
for (EntityMessage message : similar)
if (!TextUtils.isEmpty(message.thread) && message.folder != folder) {
if (!TextUtils.isEmpty(message.thread) && Objects.equals(message.hash, getHash())) {
thread = message.thread;
break;
}
@ -1835,7 +1836,9 @@ public class MessageHelper {
String getHash() throws MessagingException {
try {
return Helper.sha1(getHeaders().getBytes());
if (hash == null)
hash = Helper.sha1(getHeaders().getBytes());
return hash;
} catch (NoSuchAlgorithmException ex) {
Log.e(ex);
return null;