create a new draft when editing draft is scheduled in another client

close #295

Author: BijinDev

src/common/mailFunctionality/SendMailModel.ts

@@ -1150,10 +1150,12 @@ export class SendMailModel {
 			this._draftSavedRecently = true
 			this.waitUntilSync = false
 
+			//load the updated mail to check if the draft is already scheduled in another client
+			const upToDateDraft = this.draft && (await this.entity.load(MailTypeRef, this.draft._id))
 			this.draft =
-				this.draft == null || (await this.needNewDraft(this.draft))
+				upToDateDraft == null || (await this.needNewDraft(upToDateDraft))
 					? await this.createDraft(body, attachments, mailMethod)
-					: await this.updateDraft(body, attachments, this.draft)
+					: await this.updateDraft(body, attachments, upToDateDraft)
 
 			const attachmentIds = await this.mailFacade.getAttachmentIds(this.draft)
 			const newAttachments = await promiseMap(attachmentIds, (fileId) => this.entity.load<TutanotaFile>(FileTypeRef, fileId), {

src/mail-app/mailLocator.ts

@@ -124,7 +124,7 @@ import { MailModel } from "./mail/model/MailModel.js"
 import type { CommonLocator } from "../common/api/main/CommonLocator.js"
 import { WorkerRandomizer } from "../common/api/worker/workerInterfaces.js"
 import { WorkerInterface } from "./workerUtils/worker/WorkerImpl.js"
-import { isMailInSpamOrTrash } from "./mail/model/MailChecks.js"
+import { isEditableDraft, isMailInSpamOrTrash } from "./mail/model/MailChecks.js"
 import type { ContactImporter } from "./contacts/ContactImporter.js"
 import { ExternalCalendarFacade } from "../common/native/common/generatedipc/ExternalCalendarFacade.js"
 import { AppType } from "../common/misc/ClientConstants.js"
@@ -460,7 +460,7 @@ class MailLocator implements CommonLocator {
 				mailboxProperties,
 				this.autosaveFacade,
 				async (mail: Mail) => {
-					return await isMailInSpamOrTrash(mail, mailLocator.mailModel)
+					return !isEditableDraft(mail) || (await isMailInSpamOrTrash(mail, mailLocator.mailModel))
 				},
 				this.syncTracker,
 			)