cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inputdataop: leave content as-is if no header found (fixes #1592)

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-11-14 23:37:29 +01:00
parent d263bade92
commit ba2c5c3bd0
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
View File

@@ -165,6 +165,7 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
parser.setContentDecoding(true); parser.setContentDecoding(true);
parser.setRecurse(); parser.setRecurse();
parser.setContentHandler(new AbstractContentHandler() { parser.setContentHandler(new AbstractContentHandler() {
private boolean mFoundHeaderWithFields = false;
private Uri uncheckedSignedDataUri; private Uri uncheckedSignedDataUri;
String mFilename; String mFilename;
@@ -220,12 +221,20 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
mFilename = null; mFilename = null;
} }
@Override
public void endHeader() throws MimeException {
if ( ! mFoundHeaderWithFields) {
parser.stop();
}
}
@Override @Override
public void field(Field field) throws MimeException { public void field(Field field) throws MimeException {
field = DefaultFieldParser.getParser().parse(field, DecodeMonitor.SILENT); field = DefaultFieldParser.getParser().parse(field, DecodeMonitor.SILENT);
if (field instanceof ContentDispositionField) { if (field instanceof ContentDispositionField) {
mFilename = ((ContentDispositionField) field).getFilename(); mFilename = ((ContentDispositionField) field).getFilename();
} }
mFoundHeaderWithFields = true;
} }
private void bodySignature(BodyDescriptor bd, InputStream is) throws MimeException, IOException { private void bodySignature(BodyDescriptor bd, InputStream is) throws MimeException, IOException {