Low light archive/sent folder name when message duplicate

This commit is contained in:
M66B
2018-11-22 11:24:52 +01:00
parent 127156d12a
commit 45af78725a
4 changed files with 23 additions and 9 deletions

View File

@@ -1906,7 +1906,8 @@ public class ServiceSynchronize extends LifecycleService {
" folder=" + dfolder.type + ":" + dup.folder + "/" + folder.type + ":" + folder.id +
" msgid=" + dup.msgid + " thread=" + dup.thread);
if (dup.folder.equals(folder.id) || outbox) {
if (!EntityFolder.ARCHIVE.equals(dfolder.type) &&
dup.folder.equals(folder.id) || outbox) {
String thread = helper.getThreadId(uid);
Log.i(Helper.TAG, folder.name + " found as id=" + dup.id + "/" + uid +
" msgid=" + msgid + " thread=" + thread);
@@ -1966,11 +1967,9 @@ public class ServiceSynchronize extends LifecycleService {
message.identity = (identity == null ? null : identity.id);
message.uid = uid;
if (!EntityFolder.ARCHIVE.equals(folder.type)) {
message.msgid = helper.getMessageID();
if (TextUtils.isEmpty(message.msgid))
Log.w(Helper.TAG, "No Message-ID id=" + message.id + " uid=" + message.uid);
}
message.msgid = helper.getMessageID();
if (TextUtils.isEmpty(message.msgid))
Log.w(Helper.TAG, "No Message-ID id=" + message.id + " uid=" + message.uid);
message.references = TextUtils.join(" ", helper.getReferences());
message.inreplyto = helper.getInReplyTo();