moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Bulletproofing against running IMAP Copy/Move commands with null messagelists. Fixes Issue 914

This commit is contained in:
Jesse Vincent 2009-12-15 18:48:32 +00:00
parent 71ea9f3795
commit a2540121fa
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/email/mail/store/ImapStore.java
View File

@ -698,6 +698,10 @@ public class ImapStore extends Store
{ {
throw new MessagingException("ImapFolder.copyMessages passed non-ImapFolder"); throw new MessagingException("ImapFolder.copyMessages passed non-ImapFolder");
} }
if (messages.length == 0)
return;
ImapFolder iFolder = (ImapFolder)folder; ImapFolder iFolder = (ImapFolder)folder;
checkOpen(); checkOpen();
String[] uids = new String[messages.length]; String[] uids = new String[messages.length];
@ -720,12 +724,17 @@ public class ImapStore extends Store
@Override @Override
public void moveMessages(Message[] messages, Folder folder) throws MessagingException public void moveMessages(Message[] messages, Folder folder) throws MessagingException
{ {
if (messages.length == 0)
return;
copyMessages(messages, folder); copyMessages(messages, folder);
setFlags(messages, new Flag[] { Flag.DELETED }, true); setFlags(messages, new Flag[] { Flag.DELETED }, true);
} }
public void delete(Message[] messages, String trashFolderName) throws MessagingException public void delete(Message[] messages, String trashFolderName) throws MessagingException
{ {
if (messages.length == 0)
return;
if (getName().equals(trashFolderName)) if (getName().equals(trashFolderName))
{ {
setFlags(messages, new Flag[] { Flag.DELETED }, true); setFlags(messages, new Flag[] { Flag.DELETED }, true);