moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-03-10 06:20:24 -04:00
Code Issues Releases Wiki Activity

Avoid NullPointerException for messages with html_content = NULL in DB

Browse Source 
Fixes issue 3302
This commit is contained in:
cketti 2011-05-06 20:02:55 +02:00 committed by Jesse Vincent
parent fb719d5b78
commit be6299fbf1
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/fsck/k9/mail/store/LocalStore.java
View File

@ -2425,16 +2425,18 @@ public class LocalStore extends Store implements Serializable {
{ Long.toString(messageId) }, null, null, null); { Long.toString(messageId) }, null, null, null);
try { try {
if (cursor.moveToNext()) { if (cursor.moveToNext()) {
String new_html; String htmlContent = cursor.getString(0);
new_html = cursor.getString(0); if (htmlContent != null) {
new_html = new_html.replaceAll(Pattern.quote("cid:" + contentId), String newHtmlContent = htmlContent.replaceAll(
contentUri.toString()); Pattern.quote("cid:" + contentId),
contentUri.toString());
ContentValues cv = new ContentValues(); ContentValues cv = new ContentValues();
cv.put("html_content", new_html); cv.put("html_content", newHtmlContent);
db.update("messages", cv, "id = ?", new String[] db.update("messages", cv, "id = ?", new String[]
{ Long.toString(messageId) }); { Long.toString(messageId) });
}
} }
} finally { } finally {
if (cursor != null) { if (cursor != null) {