moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-25 17:18:50 -05:00
Code Issues Releases Wiki Activity

Fixed EOLConvertingOutputStream.

Browse Source 
write('\r');flush();write('\n'); would lead to "\r\n\r\n" instead of simply "\r\n";
This commit is contained in:
cketti 2010-02-05 02:36:52 +00:00
parent 0422cae33e
commit 14ee970b18
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/fsck/k9/mail/transport/EOLConvertingOutputStream.java
View File

@ -6,7 +6,8 @@ import java.io.OutputStream;
public class EOLConvertingOutputStream extends FilterOutputStream
{
int lastChar;
private int lastChar;
private boolean ignoreNextIfLF = false;
public EOLConvertingOutputStream(OutputStream out)
{
@ -16,15 +17,16 @@ public class EOLConvertingOutputStream extends FilterOutputStream
@Override
public void write(int oneByte) throws IOException
{
if (oneByte == '\n')
if (!ignoreNextIfLF)
{
if (lastChar != '\r')
if ((oneByte == '\n') && (lastChar != '\r'))
{
super.write('\r');
}
super.write(oneByte);
lastChar = oneByte;
}
super.write(oneByte);
lastChar = oneByte;
ignoreNextIfLF = false;
}
@Override
@ -34,6 +36,11 @@ public class EOLConvertingOutputStream extends FilterOutputStream
{
super.write('\n');
lastChar = '\n';
// We have to ignore the next character if it is <LF>. Otherwise it
// will be expanded to an additional <CR><LF> sequence although it
// belongs to the one just completed.
ignoreNextIfLF = true;
}
super.flush();
}