moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-21 23:18:49 -05:00
Code Issues Releases Wiki Activity

IMAP: fix 564, Moving / copying messages in public mailbox

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2287 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2014-04-29 21:18:46 +00:00
parent ad404804ad
commit 446f841a1e
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/java/davmail/imap/ImapConnection.java
View File

@ -156,12 +156,7 @@ public class ImapConnection extends AbstractConnection {
session = ExchangeSessionFactory.getInstance(session, userName, password);
if ("lsub".equalsIgnoreCase(command) || "list".equalsIgnoreCase(command)) {
if (tokens.hasMoreTokens()) {
String folderContext;
if (baseMailboxPath == null) {
folderContext = BASE64MailboxDecoder.decode(tokens.nextToken());
} else {
folderContext = baseMailboxPath + BASE64MailboxDecoder.decode(tokens.nextToken());
}
String folderContext = buildFolderContext(tokens.nextToken());
if (tokens.hasMoreTokens()) {
String folderQuery = folderContext + BASE64MailboxDecoder.decode(tokens.nextToken());
if (folderQuery.endsWith("%/%") && !"/%/%".equals(folderQuery)) {
@ -344,7 +339,7 @@ public class ImapConnection extends AbstractConnection {
} else if ("copy".equalsIgnoreCase(subcommand) || "move".equalsIgnoreCase(subcommand)) {
try {
UIDRangeIterator uidRangeIterator = new UIDRangeIterator(currentFolder.messages, tokens.nextToken());
String targetName = BASE64MailboxDecoder.decode(tokens.nextToken());
String targetName = buildFolderContext(tokens.nextToken());
if (!uidRangeIterator.hasNext()) {
sendClient(commandId + " NO " + "No message found");
} else {
@ -708,6 +703,14 @@ public class ImapConnection extends AbstractConnection {
}
}
protected String buildFolderContext(String folderToken) {
if (baseMailboxPath == null) {
return BASE64MailboxDecoder.decode(folderToken);
} else {
return baseMailboxPath + BASE64MailboxDecoder.decode(folderToken);
}
}
/**
* Send expunge untagged response for removed IMAP message uids.
*
@ -1947,4 +1950,4 @@ public class ImapConnection extends AbstractConnection {
}
}
}
}