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

Fixes from audit 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1435 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-09-09 19:51:25 +00:00
parent b8e4570681
commit dc21124beb
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/davmail/exchange/ExchangeSession.java
View File

@ -1198,6 +1198,12 @@ public abstract class ExchangeSession {
*/
public abstract void moveFolder(String folderName, String targetName) throws IOException;
/**
* Move item from source path to target path.
* @param sourcePath item source path
* @param targetPath item target path
* @throws IOException on error
*/
public abstract void moveItem(String sourcePath, String targetPath) throws IOException;
protected abstract void moveToTrash(Message message) throws IOException;
@ -2487,11 +2493,11 @@ public abstract class ExchangeSession {
}
}
protected static final String[] VCARD_N_PROPERTIES = {"sn", "givenName", "middlename", "personaltitle", "namesuffix"};
protected static final String[] VCARD_ADR_HOME_PROPERTIES = {"homepostofficebox", null, "homeStreet", "homeCity", "homeState", "homePostalCode", "homeCountry"};
protected static final String[] VCARD_ADR_WORK_PROPERTIES = {"postofficebox", "roomnumber", "street", "l", "st", "postalcode", "co"};
protected static final String[] VCARD_ADR_OTHER_PROPERTIES = {"otherpostofficebox", null, "otherstreet", "othercity", "otherstate", "otherpostalcode", "othercountry"};
protected static final String[] VCARD_ORG_PROPERTIES = {"o", "department"};
static final String[] VCARD_N_PROPERTIES = {"sn", "givenName", "middlename", "personaltitle", "namesuffix"};
static final String[] VCARD_ADR_HOME_PROPERTIES = {"homepostofficebox", null, "homeStreet", "homeCity", "homeState", "homePostalCode", "homeCountry"};
static final String[] VCARD_ADR_WORK_PROPERTIES = {"postofficebox", "roomnumber", "street", "l", "st", "postalcode", "co"};
static final String[] VCARD_ADR_OTHER_PROPERTIES = {"otherpostofficebox", null, "otherstreet", "othercity", "otherstate", "otherpostalcode", "othercountry"};
static final String[] VCARD_ORG_PROPERTIES = {"o", "department"};
protected void convertContactProperties(Map<String, String> properties, String[] contactProperties, List<String> values) {
for (int i = 0; i < values.size() && i < contactProperties.length; i++) {

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

@ -657,9 +657,11 @@ public class ImapConnection extends AbstractConnection {
} else if (param.startsWith("BODY[") || param.startsWith("BODY.PEEK[") || "RFC822.HEADER".equals(param)) {
// get full param
if (param.indexOf('[') >= 0) {
StringBuilder paramBuffer = new StringBuilder(param);
while (paramTokens.hasMoreTokens() && param.indexOf(']') < 0) {
param += ' ' + paramTokens.nextToken();
paramBuffer.append(' ').append(paramTokens.nextToken());
}
param = paramBuffer.toString();
}
// parse buffer size
int startIndex = 0;