From 31adcd2ed84e9fd0c451d16c00795f419efdb3f1 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Thu, 2 Jun 2011 09:35:03 -0400 Subject: [PATCH] Revert "http://code.google.com/p/k9mail/issues/detail?id=3408&sort=-id&colspec=ID%20Product%20Type%20Status%20Priority%20Milestone%20Owner%20Summary" This reverts commit 0c2e06133c4a877d8d1f50e8a8113842faac9091. The patch would cause an extra SMTP connection on _any_ meesage with attachments. Marcus is headed away on holiday and asked me to revert it for him (after I asked him to revert it) - With luck, we'll talk through a design to work around this issue on the list Conflicts: src/com/fsck/k9/mail/transport/SmtpTransport.java --- src/com/fsck/k9/mail/transport/SmtpTransport.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/com/fsck/k9/mail/transport/SmtpTransport.java b/src/com/fsck/k9/mail/transport/SmtpTransport.java index 39f483342..f82ba6849 100644 --- a/src/com/fsck/k9/mail/transport/SmtpTransport.java +++ b/src/com/fsck/k9/mail/transport/SmtpTransport.java @@ -352,20 +352,11 @@ public class SmtpTransport extends Transport { // If the message has attachments and our server has told us about a limit on // the size of messages, count the message's size before sending it if (mLargestAcceptableMessage > 0 && ((LocalMessage)message).hasAttachments()) { - if (K9.DEBUG_PROTOCOL_SMTP) { - Log.d(K9.LOG_TAG, "calculating message size"); - } - close(); // (prevent timeouts while calculating the size) - final long calculatedSize = message.calculateSize(); - if (calculatedSize > mLargestAcceptableMessage) { + if (message.calculateSize() > mLargestAcceptableMessage) { MessagingException me = new MessagingException("Message too large for server"); me.setPermanentFailure(possibleSend); throw me; } - open(); // (prevent timeouts while calculating the size) - if (K9.DEBUG_PROTOCOL_SMTP) { - Log.d(K9.LOG_TAG, "calculating message size DONE size=" + calculatedSize + " max allowed=" + mLargestAcceptableMessage); - } } Address[] from = message.getFrom();