mirror of https://github.com/M66B/FairEmail.git
parent
aef8b1385e
commit
64b9227ea8
|
@ -587,9 +587,6 @@ public interface DaoMessage {
|
||||||
@Query("UPDATE message SET revisions = :revisions WHERE id = :id")
|
@Query("UPDATE message SET revisions = :revisions WHERE id = :id")
|
||||||
int setMessageRevisions(long id, Integer revisions);
|
int setMessageRevisions(long id, Integer revisions);
|
||||||
|
|
||||||
@Query("UPDATE message SET thread = :thread WHERE id = :id")
|
|
||||||
int setMessageThread(long id, String thread);
|
|
||||||
|
|
||||||
@Query("UPDATE message" +
|
@Query("UPDATE message" +
|
||||||
" SET content = 0, fts = 0, language = NULL, plain_only = NULL, preview = NULL" +
|
" SET content = 0, fts = 0, language = NULL, plain_only = NULL, preview = NULL" +
|
||||||
" WHERE id = :id")
|
" WHERE id = :id")
|
||||||
|
|
|
@ -873,19 +873,12 @@ public class MessageHelper {
|
||||||
if (!TextUtils.isEmpty(inreplyto) && !refs.contains(inreplyto))
|
if (!TextUtils.isEmpty(inreplyto) && !refs.contains(inreplyto))
|
||||||
refs.add(inreplyto);
|
refs.add(inreplyto);
|
||||||
|
|
||||||
String thread = null;
|
|
||||||
DB db = DB.getInstance(context);
|
DB db = DB.getInstance(context);
|
||||||
for (String ref : refs) {
|
for (String ref : refs) {
|
||||||
List<EntityMessage> messages = db.message().getMessagesByMsgId(account, ref);
|
List<EntityMessage> messages = db.message().getMessagesByMsgId(account, ref);
|
||||||
for (EntityMessage message : messages) {
|
if (messages.size() > 0)
|
||||||
if (thread == null)
|
return messages.get(0).thread;
|
||||||
thread = message.thread;
|
|
||||||
if (thread != null && !thread.equals(message.thread))
|
|
||||||
db.message().setMessageThread(message.id, thread);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (thread != null)
|
|
||||||
return thread;
|
|
||||||
|
|
||||||
if (refs.size() > 0)
|
if (refs.size() > 0)
|
||||||
return refs.get(0);
|
return refs.get(0);
|
||||||
|
|
Loading…
Reference in New Issue