ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am e3e02ada: am dee4e253: Do not trust server-provided content type for attachments

Browse Source 
Merge commit 'e3e02adac681790ff4bea653e273f7e2b0eea35b' into eclair-mr2-plus-aosp

* commit 'e3e02adac681790ff4bea653e273f7e2b0eea35b':
  Do not trust server-provided content type for attachments
This commit is contained in:
Andrew Stadler 2009-10-14 07:46:46 -07:00 committed by Android Git Automerger
commit 77c7ce54be
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/exchange/EasSyncService.java
View File

@ -305,7 +305,6 @@ public class EasSyncService extends AbstractSyncService {
if (status == HttpStatus.SC_OK) { if (status == HttpStatus.SC_OK) {
HttpEntity e = res.getEntity(); HttpEntity e = res.getEntity();
int len = (int)e.getContentLength(); int len = (int)e.getContentLength();
String type = e.getContentType().getValue();
InputStream is = res.getEntity().getContent(); InputStream is = res.getEntity().getContent();
File f = (req.destination != null) File f = (req.destination != null)
? new File(req.destination) ? new File(req.destination)
@ -344,7 +343,6 @@ public class EasSyncService extends AbstractSyncService {
: "file://" + f.getAbsolutePath(); : "file://" + f.getAbsolutePath();
ContentValues cv = new ContentValues(); ContentValues cv = new ContentValues();
cv.put(AttachmentColumns.CONTENT_URI, contentUriString); cv.put(AttachmentColumns.CONTENT_URI, contentUriString);
cv.put(AttachmentColumns.MIME_TYPE, type);
att.update(mContext, cv); att.update(mContext, cv);
doStatusCallback(msg.mId, att.mId, EmailServiceStatus.SUCCESS); doStatusCallback(msg.mId, att.mId, EmailServiceStatus.SUCCESS);
} }