moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-25 15:11:52 -05:00
Code Issues Releases Wiki Activity

astyle

Browse Source
This commit is contained in:
Jesse Vincent 2011-04-12 22:17:22 +10:00
parent d2c56edbd2
commit d3848d352d
4 changed files with 104 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/fsck/k9/activity/setup/AccountSettings.java
View File

@ -702,7 +702,7 @@ public class AccountSettings extends K9PreferenceActivity {
// In webdav account we use the exact folder name also for inbox, // In webdav account we use the exact folder name also for inbox,
// since it varies because of internationalization // since it varies because of internationalization
if(mAccount.getStoreUri().startsWith("webdav")) if (mAccount.getStoreUri().startsWith("webdav"))
mAccount.setAutoExpandFolderName(mAutoExpandFolder.getValue()); mAccount.setAutoExpandFolderName(mAutoExpandFolder.getValue());
else else
mAccount.setAutoExpandFolderName(reverseTranslateFolder(mAutoExpandFolder.getValue())); mAccount.setAutoExpandFolderName(reverseTranslateFolder(mAutoExpandFolder.getValue()));

40
src/com/fsck/k9/mail/store/WebDavStore.java
View File

@ -256,29 +256,29 @@ public class WebDavStore extends Store {
HashMap<String, String> specialFoldersMap = dataset.getSpecialFolderToUrl(); HashMap<String, String> specialFoldersMap = dataset.getSpecialFolderToUrl();
String folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_INBOX_FOLDER)); String folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_INBOX_FOLDER));
if(folderName != null) { if (folderName != null) {
mAccount.setAutoExpandFolderName(folderName); mAccount.setAutoExpandFolderName(folderName);
mAccount.setInboxFolderName(folderName); mAccount.setInboxFolderName(folderName);
} }
folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_DRAFTS_FOLDER)); folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_DRAFTS_FOLDER));
if(folderName != null) if (folderName != null)
mAccount.setDraftsFolderName(folderName); mAccount.setDraftsFolderName(folderName);
folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_TRASH_FOLDER)); folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_TRASH_FOLDER));
if(folderName != null) if (folderName != null)
mAccount.setTrashFolderName(folderName); mAccount.setTrashFolderName(folderName);
folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_SPAM_FOLDER)); folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_SPAM_FOLDER));
if(folderName != null) if (folderName != null)
mAccount.setSpamFolderName(folderName); mAccount.setSpamFolderName(folderName);
folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_OUTBOX_FOLDER)); folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_OUTBOX_FOLDER));
if(folderName != null) if (folderName != null)
mAccount.setOutboxFolderName(folderName); mAccount.setOutboxFolderName(folderName);
folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_SENT_FOLDER)); folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_SENT_FOLDER));
if(folderName != null) if (folderName != null)
mAccount.setSentFolderName(folderName); mAccount.setSentFolderName(folderName);
/** /**
@ -293,7 +293,7 @@ public class WebDavStore extends Store {
for (int i = 0; i < folderUrls.length; i++) { for (int i = 0; i < folderUrls.length; i++) {
String tempUrl = folderUrls[i]; String tempUrl = folderUrls[i];
WebDavFolder folder = createFolder(tempUrl); WebDavFolder folder = createFolder(tempUrl);
if(folder != null) if (folder != null)
folderList.add(folder); folderList.add(folder);
} }
@ -308,13 +308,13 @@ public class WebDavStore extends Store {
* @return * @return
*/ */
private WebDavFolder createFolder(String folderUrl) { private WebDavFolder createFolder(String folderUrl) {
if(folderUrl == null) if (folderUrl == null)
return null; return null;
WebDavFolder wdFolder=null; WebDavFolder wdFolder = null;
String folderName = getFolderName(folderUrl); String folderName = getFolderName(folderUrl);
if(folderName != null) { if (folderName != null) {
if(!this.mFolderList.containsKey(folderName)) { if (!this.mFolderList.containsKey(folderName)) {
wdFolder = new WebDavFolder(this, folderName); wdFolder = new WebDavFolder(this, folderName);
wdFolder.setUrl(folderUrl); wdFolder.setUrl(folderUrl);
mFolderList.put(folderName, wdFolder); mFolderList.put(folderName, wdFolder);
@ -326,28 +326,28 @@ public class WebDavStore extends Store {
} }
private String getFolderName(String folderUrl) { private String getFolderName(String folderUrl) {
if(folderUrl == null) if (folderUrl == null)
return null; return null;
// Here we extract the folder name starting from the complete url. // Here we extract the folder name starting from the complete url.
// folderUrl is in the form http://mail.domain.com/exchange/username/foldername // folderUrl is in the form http://mail.domain.com/exchange/username/foldername
// so we need "foldername" which is the string after the fifth slash // so we need "foldername" which is the string after the fifth slash
int folderSlash=-1; int folderSlash = -1;
for(int j=0; j < 5; j++) { for (int j = 0; j < 5; j++) {
folderSlash=folderUrl.indexOf('/', folderSlash+1); folderSlash = folderUrl.indexOf('/', folderSlash + 1);
if(folderSlash < 0) if (folderSlash < 0)
break; break;
} }
if(folderSlash > 0) { if (folderSlash > 0) {
String folderName; String folderName;
String fullPathName; String fullPathName;
// Removes the final slash if present // Removes the final slash if present
if(folderUrl.charAt(folderUrl.length()-1) == '/') if (folderUrl.charAt(folderUrl.length() - 1) == '/')
fullPathName = folderUrl.substring(folderSlash+1, folderUrl.length()-1); fullPathName = folderUrl.substring(folderSlash + 1, folderUrl.length() - 1);
else else
fullPathName = folderUrl.substring(folderSlash+1); fullPathName = folderUrl.substring(folderSlash + 1);
// Decodes the url-encoded folder name (i.e. "My%20folder" => "My Folder" // Decodes the url-encoded folder name (i.e. "My%20folder" => "My Folder"
try { try {