From 953b784fb9acaeb73d79509ee46fae87dabec482 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 29 Dec 2009 17:06:13 +0000 Subject: [PATCH] First pass at fixing Issue 963 (explosions when trying to iterate over a remotely deleted message) introduced in r1204. (Before my all-day meeting) --- src/com/fsck/k9/activity/MessageList.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index 05036a64c..c246408ae 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -150,7 +150,7 @@ public class MessageList { for (MessageInfoHolder message : messages) { - if (mFolderName == null || message.folder.name.equals(mFolderName)) + if (mFolderName == null || (message.folder != null && message.folder.name.equals(mFolderName))) { if (message != null && message.selected && mSelectedCount > 0) { @@ -173,7 +173,7 @@ public class MessageList for (final MessageInfoHolder message : messages) { - if (mFolderName == null || message.folder.name.equals(mFolderName)) + if (mFolderName == null || (message.folder != null && message.folder.name.equals(mFolderName))) { runOnUiThread(new Runnable()