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

email: fix empty body update

Browse Source 
Currently, body text and html are removed from the content values to be stored as files
in the filesystem. This could lead to a IllegalArgumentException because we passed
an empty content value to the update operation. We must ensure that we update
at least one item.

Related BUGDUMP-4037330 and http://forum.cyanogenmod.org/topic/112563-massive-data-use

Change-Id: Ib9ba10eb2cb86598bef6e5f8bc11553d09fc4ef8
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
This commit is contained in:
Jorge Ruesga 2015-10-07 00:07:38 +02:00 committed by Steve Kondik
parent ead5cd372c
commit 6adbdc9f6b
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
provider_src/com/android/email/provider/EmailProvider.java
View File

@ -2243,7 +2243,22 @@ public class EmailProvider extends ContentProvider
updateValues.remove(BodyColumns.HTML_CONTENT); updateValues.remove(BodyColumns.HTML_CONTENT);
updateValues.remove(BodyColumns.TEXT_CONTENT); updateValues.remove(BodyColumns.TEXT_CONTENT);
// Since we removed the html and text values from the update operation,
// db.update() can fail because updateValues is empty. Just to a safe check
// before continue, and in case check if we found at least the selection
// record in db and fill the result variable for later hack check.
if (updateValues.size() == 0) {
final String proj[] = {BaseColumns._ID};
final Cursor c = db.query(Body.TABLE_NAME, proj, selection, selectionArgs,
null, null, null);
try {
result = c.getCount();
} finally {
c.close();
}
} else {
result = db.update(tableName, updateValues, selection, selectionArgs); result = db.update(tableName, updateValues, selection, selectionArgs);
}
if (result == 0 && selection.equals(Body.SELECTION_BY_MESSAGE_KEY)) { if (result == 0 && selection.equals(Body.SELECTION_BY_MESSAGE_KEY)) {
// TODO: This is a hack. Notably, the selection equality test above // TODO: This is a hack. Notably, the selection equality test above