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

Merge pull request #3219 from k9mail/GH-632_case_sensitive_folder_name_comparisons

Browse source 
Case sensitive folder name comparisons
This commit is contained in:
cketti 2018-02-27 19:55:46 +01:00 committed by GitHub
commit 49257b0fda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 41 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import static com.fsck.k9.mail.store.imap.ImapUtility.getLastResponse;
class ImapFolder extends Folder<ImapMessage> { class ImapFolder extends Folder<ImapMessage> {
static final String INBOX = "INBOX";
private static final ThreadLocal<SimpleDateFormat> RFC3501_DATE = new ThreadLocal<SimpleDateFormat>() { private static final ThreadLocal<SimpleDateFormat> RFC3501_DATE = new ThreadLocal<SimpleDateFormat>() {
@Override @Override
protected SimpleDateFormat initialValue() { protected SimpleDateFormat initialValue() {
@ -78,7 +79,7 @@ class ImapFolder extends Folder<ImapMessage> {
private String getPrefixedName() throws MessagingException { private String getPrefixedName() throws MessagingException {
String prefixedName = ""; String prefixedName = "";
if (!store.getStoreConfig().getInboxFolderName().equalsIgnoreCase(name)) { if (!INBOX.equalsIgnoreCase(name)) {
ImapConnection connection; ImapConnection connection;
synchronized (this) { synchronized (this) {
if (this.connection == null) { if (this.connection == null) {
@ -391,7 +392,7 @@ class ImapFolder extends Folder<ImapMessage> {
return; return;
} }
if (trashFolderName == null || getName().equalsIgnoreCase(trashFolderName)) { if (trashFolderName == null || getName().equals(trashFolderName)) {
setFlags(messages, Collections.singleton(Flag.DELETED), true); setFlags(messages, Collections.singleton(Flag.DELETED), true);
} else { } else {
ImapFolder remoteTrashFolder = getStore().getFolder(trashFolderName); ImapFolder remoteTrashFolder = getStore().getFolder(trashFolderName);
@ -1369,7 +1370,7 @@ class ImapFolder extends Folder<ImapMessage> {
public boolean equals(Object other) { public boolean equals(Object other) {
if (other instanceof ImapFolder) { if (other instanceof ImapFolder) {
ImapFolder otherFolder = (ImapFolder) other; ImapFolder otherFolder = (ImapFolder) other;
return otherFolder.getName().equalsIgnoreCase(getName()); return otherFolder.getName().equals(getName());
} }
return super.equals(other); return super.equals(other);

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

@ -197,7 +197,7 @@ public class ImapStore extends RemoteStore {
combinedPrefix = null; combinedPrefix = null;
} }
if (folder.equalsIgnoreCase(mStoreConfig.getInboxFolderName())) { if (ImapFolder.INBOX.equalsIgnoreCase(folder)) {
continue; continue;
} else if (folder.equals(mStoreConfig.getOutboxFolderName())) { } else if (folder.equals(mStoreConfig.getOutboxFolderName())) {
/* /*
@ -216,12 +216,14 @@ public class ImapStore extends RemoteStore {
} }
} }
folderNames.add(mStoreConfig.getInboxFolderName()); folderNames.add(ImapFolder.INBOX);
return folderNames; return folderNames;
} }
void autoconfigureFolders(final ImapConnection connection) throws IOException, MessagingException { void autoconfigureFolders(final ImapConnection connection) throws IOException, MessagingException {
mStoreConfig.setInboxFolderName(ImapFolder.INBOX);
if (!connection.hasCapability(Capabilities.SPECIAL_USE)) { if (!connection.hasCapability(Capabilities.SPECIAL_USE)) {
if (K9MailLib.isDebug()) { if (K9MailLib.isDebug()) {
Timber.d("No detected folder auto-configuration methods."); Timber.d("No detected folder auto-configuration methods.");

11
k9mail-library/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Folder.java
View file

@ -31,6 +31,9 @@ import static com.fsck.k9.mail.store.pop3.Pop3Commands.*;
* POP3 only supports one folder, "Inbox". So the folder name is the ID here. * POP3 only supports one folder, "Inbox". So the folder name is the ID here.
*/ */
class Pop3Folder extends Folder<Pop3Message> { class Pop3Folder extends Folder<Pop3Message> {
static final String INBOX = "INBOX";
private Pop3Store pop3Store; private Pop3Store pop3Store;
private Map<String, Pop3Message> uidToMsgMap = new HashMap<>(); private Map<String, Pop3Message> uidToMsgMap = new HashMap<>();
@SuppressLint("UseSparseArrays") @SuppressLint("UseSparseArrays")
@ -44,10 +47,6 @@ class Pop3Folder extends Folder<Pop3Message> {
super(); super();
this.pop3Store = pop3Store; this.pop3Store = pop3Store;
this.name = name; this.name = name;
if (this.name.equalsIgnoreCase(pop3Store.getConfig().getInboxFolderName())) {
this.name = pop3Store.getConfig().getInboxFolderName();
}
} }
@Override @Override
@ -56,7 +55,7 @@ class Pop3Folder extends Folder<Pop3Message> {
return; return;
} }
if (!name.equalsIgnoreCase(pop3Store.getConfig().getInboxFolderName())) { if (!INBOX.equals(name)) {
throw new MessagingException("Folder does not exist"); throw new MessagingException("Folder does not exist");
} }
@ -113,7 +112,7 @@ class Pop3Folder extends Folder<Pop3Message> {
@Override @Override
public boolean exists() throws MessagingException { public boolean exists() throws MessagingException {
return name.equalsIgnoreCase(pop3Store.getConfig().getInboxFolderName()); return INBOX.equals(name);
} }
@Override @Override

6
k9mail-library/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Store.java
View file

@ -201,13 +201,15 @@ public class Pop3Store extends RemoteStore {
@Override @Override
public List<Pop3Folder> getPersonalNamespaces(boolean forceListAll) throws MessagingException { public List<Pop3Folder> getPersonalNamespaces(boolean forceListAll) throws MessagingException {
List<Pop3Folder> folders = new LinkedList<>(); List<Pop3Folder> folders = new LinkedList<>();
folders.add(getFolder(mStoreConfig.getInboxFolderName())); folders.add(getFolder(Pop3Folder.INBOX));
return folders; return folders;
} }
@Override @Override
public void checkSettings() throws MessagingException { public void checkSettings() throws MessagingException {
Pop3Folder folder = new Pop3Folder(this, mStoreConfig.getInboxFolderName()); mStoreConfig.setInboxFolderName(Pop3Folder.INBOX);
Pop3Folder folder = new Pop3Folder(this, Pop3Folder.INBOX);
try { try {
folder.open(Folder.OPEN_MODE_RW); folder.open(Folder.OPEN_MODE_RW);
folder.requestUidl(); folder.requestUidl();

6
k9mail-library/src/test/java/com/fsck/k9/mail/store/pop3/Pop3FolderTest.java
View file

@ -6,8 +6,6 @@ import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.fsck.k9.mail.FetchProfile; import com.fsck.k9.mail.FetchProfile;
@ -49,10 +47,10 @@ public class Pop3FolderTest {
mockStoreConfig = mock(StoreConfig.class); mockStoreConfig = mock(StoreConfig.class);
mockListener = mock(MessageRetrievalListener.class); mockListener = mock(MessageRetrievalListener.class);
when(mockStore.getConfig()).thenReturn(mockStoreConfig); when(mockStore.getConfig()).thenReturn(mockStoreConfig);
when(mockStoreConfig.getInboxFolderName()).thenReturn("Inbox"); when(mockStoreConfig.getInboxFolderName()).thenReturn(Pop3Folder.INBOX);
when(mockStore.createConnection()).thenReturn(mockConnection); when(mockStore.createConnection()).thenReturn(mockConnection);
when(mockConnection.executeSimpleCommand(Pop3Commands.STAT_COMMAND)).thenReturn("+OK 10 0"); when(mockConnection.executeSimpleCommand(Pop3Commands.STAT_COMMAND)).thenReturn("+OK 10 0");
folder = new Pop3Folder(mockStore, "Inbox"); folder = new Pop3Folder(mockStore, Pop3Folder.INBOX);
BinaryTempFileBody.setTempDirectory(new File(System.getProperty("java.io.tmpdir"))); BinaryTempFileBody.setTempDirectory(new File(System.getProperty("java.io.tmpdir")));
} }

8
k9mail-library/src/test/java/com/fsck/k9/mail/store/pop3/Pop3StoreTest.java
View file

@ -66,7 +66,7 @@ public class Pop3StoreTest {
public void setUp() throws Exception { public void setUp() throws Exception {
//Using a SSL socket allows us to mock it //Using a SSL socket allows us to mock it
when(mockStoreConfig.getStoreUri()).thenReturn("pop3+ssl+://PLAIN:user:password@server:12345"); when(mockStoreConfig.getStoreUri()).thenReturn("pop3+ssl+://PLAIN:user:password@server:12345");
when(mockStoreConfig.getInboxFolderName()).thenReturn("Inbox"); when(mockStoreConfig.getInboxFolderName()).thenReturn(Pop3Folder.INBOX);
when(mockTrustedSocketFactory.createSocket(null, "server", 12345, null)).thenReturn(mockSocket); when(mockTrustedSocketFactory.createSocket(null, "server", 12345, null)).thenReturn(mockSocket);
when(mockSocket.isConnected()).thenReturn(true); when(mockSocket.isConnected()).thenReturn(true);
when(mockSocket.isClosed()).thenReturn(false); when(mockSocket.isClosed()).thenReturn(false);
@ -187,7 +187,7 @@ public class Pop3StoreTest {
List<Pop3Folder> folders = store.getPersonalNamespaces(true); List<Pop3Folder> folders = store.getPersonalNamespaces(true);
assertEquals(1, folders.size()); assertEquals(1, folders.size());
assertEquals("Inbox", folders.get(0).getName()); assertEquals("INBOX", folders.get(0).getName());
} }
@Test @Test
@ -247,7 +247,7 @@ public class Pop3StoreTest {
when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(response.getBytes("UTF-8"))); when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(response.getBytes("UTF-8")));
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
when(mockSocket.getOutputStream()).thenReturn(byteArrayOutputStream); when(mockSocket.getOutputStream()).thenReturn(byteArrayOutputStream);
Pop3Folder folder = store.getFolder("Inbox"); Pop3Folder folder = store.getFolder(Pop3Folder.INBOX);
folder.open(Folder.OPEN_MODE_RW); folder.open(Folder.OPEN_MODE_RW);
@ -262,7 +262,7 @@ public class Pop3StoreTest {
CAPA_RESPONSE + CAPA_RESPONSE +
AUTH_PLAIN_FAILED_RESPONSE; AUTH_PLAIN_FAILED_RESPONSE;
when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(response.getBytes("UTF-8"))); when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(response.getBytes("UTF-8")));
Pop3Folder folder = store.getFolder("Inbox"); Pop3Folder folder = store.getFolder(Pop3Folder.INBOX);
folder.open(Folder.OPEN_MODE_RW); folder.open(Folder.OPEN_MODE_RW);
} }

12
k9mail/src/main/java/com/fsck/k9/Account.java
View file

@ -1074,7 +1074,7 @@ public class Account implements BaseAccount, StoreConfig {
} }
public boolean isSpecialFolder(String folderName) { public boolean isSpecialFolder(String folderName) {
return (folderName != null && (folderName.equalsIgnoreCase(getInboxFolderName()) || return (folderName != null && (folderName.equals(getInboxFolderName()) ||
folderName.equals(getTrashFolderName()) || folderName.equals(getTrashFolderName()) ||
folderName.equals(getDraftsFolderName()) || folderName.equals(getDraftsFolderName()) ||
folderName.equals(getArchiveFolderName()) || folderName.equals(getArchiveFolderName()) ||
@ -1096,7 +1096,7 @@ public class Account implements BaseAccount, StoreConfig {
* @return true if account has a drafts folder set. * @return true if account has a drafts folder set.
*/ */
public synchronized boolean hasDraftsFolder() { public synchronized boolean hasDraftsFolder() {
return !K9.FOLDER_NONE.equalsIgnoreCase(draftsFolderName); return !K9.FOLDER_NONE.equals(draftsFolderName);
} }
public synchronized String getSentFolderName() { public synchronized String getSentFolderName() {
@ -1112,7 +1112,7 @@ public class Account implements BaseAccount, StoreConfig {
* @return true if account has a sent folder set. * @return true if account has a sent folder set.
*/ */
public synchronized boolean hasSentFolder() { public synchronized boolean hasSentFolder() {
return !K9.FOLDER_NONE.equalsIgnoreCase(sentFolderName); return !K9.FOLDER_NONE.equals(sentFolderName);
} }
@ -1129,7 +1129,7 @@ public class Account implements BaseAccount, StoreConfig {
* @return true if account has a trash folder set. * @return true if account has a trash folder set.
*/ */
public synchronized boolean hasTrashFolder() { public synchronized boolean hasTrashFolder() {
return !K9.FOLDER_NONE.equalsIgnoreCase(trashFolderName); return !K9.FOLDER_NONE.equals(trashFolderName);
} }
public synchronized String getArchiveFolderName() { public synchronized String getArchiveFolderName() {
@ -1145,7 +1145,7 @@ public class Account implements BaseAccount, StoreConfig {
* @return true if account has an archive folder set. * @return true if account has an archive folder set.
*/ */
public synchronized boolean hasArchiveFolder() { public synchronized boolean hasArchiveFolder() {
return !K9.FOLDER_NONE.equalsIgnoreCase(archiveFolderName); return !K9.FOLDER_NONE.equals(archiveFolderName);
} }
public synchronized String getSpamFolderName() { public synchronized String getSpamFolderName() {
@ -1161,7 +1161,7 @@ public class Account implements BaseAccount, StoreConfig {
* @return true if account has a spam folder set. * @return true if account has a spam folder set.
*/ */
public synchronized boolean hasSpamFolder() { public synchronized boolean hasSpamFolder() {
return !K9.FOLDER_NONE.equalsIgnoreCase(spamFolderName); return !K9.FOLDER_NONE.equals(spamFolderName);
} }
public synchronized String getOutboxFolderName() { public synchronized String getOutboxFolderName() {

4
k9mail/src/main/java/com/fsck/k9/activity/ActivityListener.java
View file

@ -85,9 +85,9 @@ public class ActivityListener extends SimpleMessagingListener {
} }
if (account != null) { if (account != null) {
if (displayName.equalsIgnoreCase(account.getInboxFolderName())) { if (displayName.equals(account.getInboxFolderName())) {
displayName = context.getString(R.string.special_mailbox_name_inbox); displayName = context.getString(R.string.special_mailbox_name_inbox);
} else if (displayName.equalsIgnoreCase(account.getOutboxFolderName())) { } else if (displayName.equals(account.getOutboxFolderName())) {
displayName = context.getString(R.string.special_mailbox_name_outbox); displayName = context.getString(R.string.special_mailbox_name_outbox);
} }
} }

11
k9mail/src/main/java/com/fsck/k9/activity/ChooseFolder.java
View file

@ -279,10 +279,7 @@ public class ChooseFolder extends K9ListActivity {
for (Folder folder : folders) { for (Folder folder : folders) {
String name = folder.getName(); String name = folder.getName();
// Inbox needs to be compared case-insensitively if (mHideCurrentFolder && name.equals(mFolder)) {
if (mHideCurrentFolder && (name.equals(mFolder) || (
mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) &&
mAccount.getInboxFolderName().equalsIgnoreCase(name)))) {
continue; continue;
} }
Folder.FolderClass fMode = folder.getDisplayClass(); Folder.FolderClass fMode = folder.getDisplayClass();
@ -335,7 +332,7 @@ public class ChooseFolder extends K9ListActivity {
try { try {
int position = 0; int position = 0;
for (String name : localFolders) { for (String name : localFolders) {
if (mAccount.getInboxFolderName().equalsIgnoreCase(name)) { if (mAccount.getInboxFolderName().equals(name)) {
folderList.add(getString(R.string.special_mailbox_name_inbox)); folderList.add(getString(R.string.special_mailbox_name_inbox));
mHeldInbox = name; mHeldInbox = name;
} else if (!account.getOutboxFolderName().equals(name)) { } else if (!account.getOutboxFolderName().equals(name)) {
@ -351,9 +348,7 @@ public class ChooseFolder extends K9ListActivity {
if (name.equals(mSelectFolder)) { if (name.equals(mSelectFolder)) {
selectedFolder = position; selectedFolder = position;
} }
} else if (name.equals(mFolder) || ( } else if (name.equals(mFolder)) {
mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) &&
mAccount.getInboxFolderName().equalsIgnoreCase(name))) {
selectedFolder = position; selectedFolder = position;
} }
position++; position++;

3
k9mail/src/main/java/com/fsck/k9/activity/FolderInfoHolder.java
View file

@ -121,8 +121,7 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder> {
context.getString(R.string.special_mailbox_name_drafts_fmt), name); context.getString(R.string.special_mailbox_name_drafts_fmt), name);
} else if (name.equals(account.getOutboxFolderName())) { } else if (name.equals(account.getOutboxFolderName())) {
displayName = context.getString(R.string.special_mailbox_name_outbox); displayName = context.getString(R.string.special_mailbox_name_outbox);
// FIXME: We really shouldn't do a case-insensitive comparison here } else if (name.equals(account.getInboxFolderName())) {
} else if (name.equalsIgnoreCase(account.getInboxFolderName())) {
displayName = context.getString(R.string.special_mailbox_name_inbox); displayName = context.getString(R.string.special_mailbox_name_inbox);
} else { } else {
displayName = name; displayName = name;

2
k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSettings.java
View file

@ -986,7 +986,7 @@ public class AccountSettings extends K9PreferenceActivity {
} }
private String translateFolder(String in) { private String translateFolder(String in) {
if (account.getInboxFolderName().equalsIgnoreCase(in)) { if (account.getInboxFolderName().equals(in)) {
return getString(R.string.special_mailbox_name_inbox); return getString(R.string.special_mailbox_name_inbox);
} else { } else {
return in; return in;

5
k9mail/src/main/java/com/fsck/k9/mailstore/LocalStore.java
View file

@ -918,7 +918,7 @@ public class LocalStore {
if (account.isSpecialFolder(name)) { if (account.isSpecialFolder(name)) {
prefHolder.inTopGroup = true; prefHolder.inTopGroup = true;
prefHolder.displayClass = LocalFolder.FolderClass.FIRST_CLASS; prefHolder.displayClass = LocalFolder.FolderClass.FIRST_CLASS;
if (name.equalsIgnoreCase(account.getInboxFolderName())) { if (name.equals(account.getInboxFolderName())) {
prefHolder.integrate = true; prefHolder.integrate = true;
prefHolder.notifyClass = LocalFolder.FolderClass.FIRST_CLASS; prefHolder.notifyClass = LocalFolder.FolderClass.FIRST_CLASS;
prefHolder.pushClass = LocalFolder.FolderClass.FIRST_CLASS; prefHolder.pushClass = LocalFolder.FolderClass.FIRST_CLASS;
@ -926,8 +926,7 @@ public class LocalStore {
prefHolder.pushClass = LocalFolder.FolderClass.INHERITED; prefHolder.pushClass = LocalFolder.FolderClass.INHERITED;
} }
if (name.equalsIgnoreCase(account.getInboxFolderName()) || if (name.equals(account.getInboxFolderName()) || name.equals(account.getDraftsFolderName())) {
name.equalsIgnoreCase(account.getDraftsFolderName())) {
prefHolder.syncClass = LocalFolder.FolderClass.FIRST_CLASS; prefHolder.syncClass = LocalFolder.FolderClass.FIRST_CLASS;
} else { } else {
prefHolder.syncClass = LocalFolder.FolderClass.NO_CLASS; prefHolder.syncClass = LocalFolder.FolderClass.NO_CLASS;

2
k9mail/src/main/java/com/fsck/k9/notification/NotificationActionService.java
View file

@ -233,7 +233,7 @@ public class NotificationActionService extends CoreService {
private boolean isMovePossible(MessagingController controller, Account account, private boolean isMovePossible(MessagingController controller, Account account,
String destinationFolderName) { String destinationFolderName) {
boolean isSpecialFolderConfigured = !K9.FOLDER_NONE.equalsIgnoreCase(destinationFolderName); boolean isSpecialFolderConfigured = !K9.FOLDER_NONE.equals(destinationFolderName);
return isSpecialFolderConfigured && controller.isMoveCapable(account); return isSpecialFolderConfigured && controller.isMoveCapable(account);
} }

2
k9mail/src/main/java/com/fsck/k9/notification/WearNotifications.java
View file

@ -240,7 +240,7 @@ class WearNotifications extends BaseNotifications {
} }
private boolean isMovePossible(Account account, String destinationFolderName) { private boolean isMovePossible(Account account, String destinationFolderName) {
if (K9.FOLDER_NONE.equalsIgnoreCase(destinationFolderName)) { if (K9.FOLDER_NONE.equals(destinationFolderName)) {
return false; return false;
} }

2
k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
View file

@ -301,7 +301,7 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
return; return;
} }
if (K9.FOLDER_NONE.equalsIgnoreCase(dstFolder)) { if (K9.FOLDER_NONE.equals(dstFolder)) {
return; return;
} }