Commit 1c5d0499 authored by Patrick Brunschwig's avatar Patrick Brunschwig

backed out timeout functionality as it does not work and the

bug seems to be related to the Ubuntu-Version of Thunderbird
parent 93e620f7
......@@ -78,8 +78,6 @@ const STATUS_OK = 0;
const STATUS_FAILURE = 1;
const STATUS_NOT_REQUIRED = 2;
var gTimeout = null;
/*
* Decrypt a message and copy it to a folder
*
......@@ -103,7 +101,6 @@ function EnigmailDecryptPermanently(hdr, destFolder, move) {
Ec.DEBUG_LOG("enigmailConvert.jsm: EnigmailDecryptPermanently: Calling MsgHdrToMimeMessage\n");
try {
gTimeout = Ec.setTimeout(decrypt.messageParseTimeout, 30000);
MsgHdrToMimeMessage(hdr, decrypt, decrypt.messageParseCallback, true, {examineEncryptedParts: false, partsOnDemand: false});
}
catch (ex) {
......@@ -126,7 +123,6 @@ function decryptMessageIntoFolder(destFolder, move, resolve) {
this.hdr = null;
this.decryptionTasks = [];
this.subject = "";
this.cancelled = false;
}
decryptMessageIntoFolder.prototype = {
......@@ -135,19 +131,6 @@ decryptMessageIntoFolder.prototype = {
decryptMessageIntoFolder.prototype.
messageParseCallback = function (hdr, mime) {
Ec.DEBUG_LOG("enigmailConvert.jsm: messageParseCallback: started\n");
if (this.cancelled) {
return;
}
if (gTimeout) {
try {
gTimeout.cancel();
Ec.DEBUG_LOG("enigmailConvert.jsm: messageParseCallback: timeout cleared\n");
}
catch (ex) {}
}
this.hdr = hdr;
this.mime = mime;
var self = this;
......@@ -341,21 +324,6 @@ messageParseCallback = function (hdr, mime) {
}
}
decryptMessageIntoFolder.prototype.
messageParseTimeout = function() {
Ec.DEBUG_LOG("enigmailConvert.jsm: messageParseTimeout\n");
let r = Ec.confirmDlg(null, Ec.getString("converter.msgParseTimeout"),
Ec.getString("dlg.button.wait"), Ec.getString("dlg.button.skip"));
if (! r) {
this.cancelled = true;
this.resolve(false);
return;
}
gTimeout = Ec.setTimeout(this.messageParseTimeout, 60000);
}
decryptMessageIntoFolder.prototype.
readAttachment = function (attachment, strippedName) {
return new Promise(
......
......@@ -20,7 +20,6 @@ dlg.button.close=&Close
dlg.button.continue=Con&tinue
dlg.button.skip=&Skip
dlg.button.view=&View
dlg.button.wait=&Wait
dlg.button.retry=&Retry
dlg.button.ignore=&Ignore
......@@ -589,6 +588,5 @@ filter.decryptMove.warnIncompatibe=Please note:\n\nThe filter action "Decrypt pe
# strings in enigmailConvert.jsm
converter.decryptBody.failed=Could not decrypt message with subject\n"%S".\nDo you want to retry with a different passphrase or do you want to skip the message?
converter.decryptAtt.failed=Could not decrypt attachment "%1$S"\nof message with subject\n"%2$S".\nDo you want to retry with a different passphrase or do you want to skip the message?
converter.msgParseTimeout=There was a timeout when trying to read a message for permanent decryption. Do you want to wait for 60 more seconds or skip the message?
saveLogFile.title=Save Log File
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment