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

am ffa3370b: am ea2edb63: Set MIME type correctly on drafts when content provider does not provide it.

Browse Source 
* commit 'ffa3370b39a39e597e02d15915b8b6955f19252f':
  Set MIME type correctly on drafts when content provider does not provide it.
This commit is contained in:
Mark Wei 2013-02-22 23:53:37 +00:00 committed by Android Git Automerger
commit 52fc0ed569
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/email/provider/EmailProvider.java
View File

@ -339,7 +339,7 @@ public class EmailProvider extends ContentProvider {
// For undo handling // For undo handling
private int mLastSequence = -1; private int mLastSequence = -1;
private ArrayList<ContentProviderOperation> mLastSequenceOps = private final ArrayList<ContentProviderOperation> mLastSequenceOps =
new ArrayList<ContentProviderOperation>(); new ArrayList<ContentProviderOperation>();
// Query parameter indicating the command came from UIProvider // Query parameter indicating the command came from UIProvider
@ -2513,8 +2513,8 @@ outer:
} }
com.android.mail.providers.Attachment uiAtt = com.android.mail.providers.Attachment uiAtt =
new com.android.mail.providers.Attachment(); new com.android.mail.providers.Attachment();
uiAtt.name = att.mFileName; uiAtt.setName(att.mFileName);
uiAtt.contentType = att.mMimeType; uiAtt.setContentType(att.mMimeType);
uiAtt.size = (int) att.mSize; uiAtt.size = (int) att.mSize;
uiAtt.uri = uiUri("uiattachment", att.mId); uiAtt.uri = uiUri("uiattachment", att.mId);
uiAtts.add(uiAtt); uiAtts.add(uiAtt);
@ -3524,8 +3524,8 @@ outer:
com.android.mail.providers.Attachment uiAtt) { com.android.mail.providers.Attachment uiAtt) {
Attachment att = new Attachment(); Attachment att = new Attachment();
att.setContentUri(uiAtt.contentUri.toString()); att.setContentUri(uiAtt.contentUri.toString());
att.mFileName = uiAtt.name; att.mFileName = uiAtt.getName();
att.mMimeType = uiAtt.contentType; att.mMimeType = uiAtt.getContentType();
att.mSize = uiAtt.size; att.mSize = uiAtt.size;
return att; return att;
} }
@ -4618,7 +4618,7 @@ outer:
} }
private int[] mSavedWidgetIds = new int[0]; private int[] mSavedWidgetIds = new int[0];
private ArrayList<Long> mWidgetNotifyMailboxes = new ArrayList<Long>(); private final ArrayList<Long> mWidgetNotifyMailboxes = new ArrayList<Long>();
private AppWidgetManager mAppWidgetManager; private AppWidgetManager mAppWidgetManager;
private ComponentName mEmailComponent; private ComponentName mEmailComponent;