wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove namespace prefix from auto-configured special folder names

Browse source 
Fixes #701
This commit is contained in:
m5w6 2018-01-20 21:22:16 +01:00 committed by cketti
parent a36254dbc0
commit 9d90c53050
2 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
View file

@ -267,6 +267,15 @@ public class ImapStore extends RemoteStore {
combinedPrefix = null;
}
String prefix = getCombinedPrefix();
int prefixLength = prefix.length();
if (prefixLength > 0 && decodedFolderName.startsWith(prefix)) {
if (K9MailLib.isDebug()) {
Timber.d("Folder auto-configuration stripping prefix (%s) from folder name: %s", prefix, decodedFolderName);
}
decodedFolderName = decodedFolderName.substring(prefixLength);
}
if (listResponse.hasAttribute("\\Archive") || listResponse.hasAttribute("\\All")) {
mStoreConfig.setArchiveFolderName(decodedFolderName);
if (K9MailLib.isDebug()) {

35
k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreTest.java
View file

@ -131,6 +131,31 @@ public class ImapStoreTest {
verifyNoMoreInteractions(imapConnection);
}
@Test
public void autoconfigureFolders_removeNamespacePrefix() throws Exception {
ImapConnection imapConnection = mock(ImapConnection.class);
when(imapConnection.hasCapability(Capabilities.SPECIAL_USE)).thenReturn(true);
List<ImapResponse> imapResponses = Arrays.asList(
createImapResponse("* LIST (\\Drafts) \"/\" \"INBOX.Drafts\""),
createImapResponse("* LIST (\\Sent) \"/\" \"INBOX.Sent\""),
createImapResponse("* LIST (\\Junk) \"/\" \"INBOX.Spam\""),
createImapResponse("* LIST (\\Trash) \"/\" \"INBOX.Trash\""),
createImapResponse("* LIST (\\Archive) \"/\" \"INBOX.Archive\""),
createImapResponse("5 OK Success")
);
when(imapConnection.executeSimpleCommand("LIST (SPECIAL-USE) \"\" \"INBOX.*\"")).thenReturn(imapResponses);
imapStore.setTestCombinedPrefix("INBOX.");
imapStore.autoconfigureFolders(imapConnection);
assertEquals("INBOX.", imapStore.getCombinedPrefix());
verify(storeConfig).setDraftsFolderName("Drafts");
verify(storeConfig).setSentFolderName("Sent");
verify(storeConfig).setSpamFolderName("Spam");
verify(storeConfig).setTrashFolderName("Trash");
verify(storeConfig).setArchiveFolderName("Archive");
}
@Test
public void getPersonalNamespaces_withForceListAll() throws Exception {
when(storeConfig.subscribedFoldersOnly()).thenReturn(true);
@ -313,6 +338,7 @@ public class ImapStoreTest {
static class TestImapStore extends ImapStore {
private Deque<ImapConnection> imapConnections = new ArrayDeque<>();
private String testCombinedPrefix;
public TestImapStore(StoreConfig storeConfig, TrustedSocketFactory trustedSocketFactory,
ConnectivityManager connectivityManager, OAuth2TokenProvider oauth2TokenProvider) throws MessagingException {
@ -330,5 +356,14 @@ public class ImapStoreTest {
public void enqueueImapConnection(ImapConnection imapConnection) {
imapConnections.add(imapConnection);
}
@Override
String getCombinedPrefix() {
return testCombinedPrefix != null ? testCombinedPrefix : super.getCombinedPrefix();
}
void setTestCombinedPrefix(String prefix) {
testCombinedPrefix = prefix;
}
}
}