Don't warn to re-add attachments when restoring a Mailvelope draft

pull/7348/head
Christopher Gurnee 4 years ago
parent a121960b45
commit 9d39c0a05f

@ -73,6 +73,7 @@ RELEASE 1.4.4
- Mailvelope: Add config option to use Main Keyring (#7348)
- Mailvelope: Add config option to set the size for new keys (#7348)
- Mailvelope: Always ask before discarding email currently being composed (#7348)
- Mailvelope: Fix unnecessary warning to re-add attachments when restoring a draft (#7348)
RELEASE 1.4.3
-------------

@ -3881,9 +3881,14 @@ function rcube_webmail()
ref.enable_command('spellcheck', 'insert-sig', 'toggle-editor', 'insert-response', 'save-response', false);
ref.triggerEvent('compose-encrypted', { active:true });
// notify user about loosing attachments
if (ref.env.attachments && !$.isEmptyObject(ref.env.attachments)) {
ref.alert_dialog(ref.get_label('encryptnoattachments'));
// notify user if losing attachments
if (ref.env.compose_mode != 'draft'
|| Object.keys(ref.env.attachments).length != 1
|| ref.env.attachments[Object.keys(ref.env.attachments)[0]].name != 'encrypted.asc'
) {
ref.alert_dialog(ref.get_label('encryptnoattachments'));
}
$.each(ref.env.attachments, function(name, attach) {
ref.remove_from_attachment_list(name);

Loading…
Cancel
Save