moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-25 00:58:50 -05:00
Code Issues Releases Wiki Activity

Kerio also supports auto-configuration; remove the gmail.com requirement to use XLIST for auto-configuration.

Browse Source
This commit is contained in:
Andrew Chen 2011-11-14 18:27:08 -08:00
parent 2f3565d180
commit 95215f00b7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/fsck/k9/mail/store/ImapStore.java
View File

@ -597,7 +597,7 @@ public class ImapStore extends Store {
}
/**
* Attempt to auto-configure Gmail folders, if we think the server is a Gmail server.
* Attempt to auto-configure folders by attributes if the server advertises XLIST capability.
*
* The parsing here is essentially the same as
* {@link #listFolders(com.fsck.k9.mail.store.ImapStore.ImapConnection, boolean)}; we should try to consolidate
@ -606,12 +606,12 @@ public class ImapStore extends Store {
* @throws IOException uh oh!
* @throws MessagingException uh oh!
*/
private void configureGmailFolders(final ImapConnection connection) throws IOException, MessagingException {
private void autoconfigureFolders(final ImapConnection connection) throws IOException, MessagingException {
final String commandResponse = "XLIST";
if (!connection.mSettings.getHost().toLowerCase().endsWith(".gmail.com") || !connection.capabilities.contains(commandResponse)) {
if (!connection.capabilities.contains(commandResponse)) {
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "Probably not a Gmail server, skipping Gmail namespace detection.");
Log.d(K9.LOG_TAG, "Server does not support XLIST; skipping folder auto-configuration.");
}
return;
}
@ -643,16 +643,16 @@ public class ImapStore extends Store {
String attribute = attributes.getString(i);
if (attribute.equals("\\Drafts")) {
mAccount.setDraftsFolderName(decodedFolderName);
if (K9.DEBUG) Log.d(K9.LOG_TAG, "Detected Gmail draft folder: " + decodedFolderName);
if (K9.DEBUG) Log.d(K9.LOG_TAG, "XLIST auto-configuration detected draft folder: " + decodedFolderName);
} else if (attribute.equals("\\Sent")) {
mAccount.setSentFolderName(decodedFolderName);
if (K9.DEBUG) Log.d(K9.LOG_TAG, "Detected Gmail sent folder: " + decodedFolderName);
if (K9.DEBUG) Log.d(K9.LOG_TAG, "XLIST auto-configuration detected sent folder: " + decodedFolderName);
} else if (attribute.equals("\\Spam")) {
mAccount.setSpamFolderName(decodedFolderName);
if (K9.DEBUG) Log.d(K9.LOG_TAG, "Detected Gmail spam folder: " + decodedFolderName);
if (K9.DEBUG) Log.d(K9.LOG_TAG, "XLIST auto-configuration detected spam folder: " + decodedFolderName);
} else if (attribute.equals("\\Trash")) {
mAccount.setTrashFolderName(decodedFolderName);
if (K9.DEBUG) Log.d(K9.LOG_TAG, "Detected Gmail trash folder: " + decodedFolderName);
if (K9.DEBUG) Log.d(K9.LOG_TAG, "XLIST auto-configuration detected trash folder: " + decodedFolderName);
}
}
}
@ -664,7 +664,7 @@ public class ImapStore extends Store {
try {
ImapConnection connection = new ImapConnection(new StoreImapSettings());
connection.open();
configureGmailFolders(connection);
autoconfigureFolders(connection);
connection.close();
} catch (IOException ioe) {
throw new MessagingException(K9.app.getString(R.string.error_unable_to_connect), ioe);