moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-07 10:40:11 -05:00
Code Issues Releases Wiki Activity

Changed SMTP code to handle reply codes without additional text.

Browse Source 
Fixes issue 2801
This commit is contained in:
cketti 2011-01-01 18:45:33 +00:00
parent 2d7bd5a341
commit fe724c8c79
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/fsck/k9/mail/transport/SmtpTransport.java
View File

@ -496,27 +496,32 @@ public class SmtpTransport extends Transport
writeLine(command, sensitive);
}
boolean cont = false;
do
/*
* Read lines as long as the length is 4 or larger, e.g. "220-banner text here".
* Shorter lines are either errors of contain only a reply code. Those cases will
* be handled by checkLine() below.
*/
String line = readLine();
while (line.length() >= 4)
{
String line = readLine();
checkLine(line);
if (line.length() > 4)
{
// Everything after the first four characters goes into the results array.
results.add(line.substring(4));
if (line.charAt(3) == '-')
{
cont = true;
}
else
{
cont = false;
}
}
}
while (cont);
return results;
if (line.charAt(3) != '-')
{
// If the fourth character isn't "-" this is the last line of the response.
break;
}
line = readLine();
}
// Check if the reply code indicates an error.
checkLine(line);
return results;
}