Replaced references to K9.INBOX with account.getInboxFolderName() (c46372b5) · Commits · e / os / Mail

src/com/fsck/k9/mail/store/Pop3Store.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -120,13 +120,13 @@ public class Pop3Store extends Store {
		@Override
		public List <? extends Folder > getPersonalNamespaces(boolean forceListAll) throws MessagingException {
		List<Folder> folders = new LinkedList<Folder>();
		folders.add(getFolder("INBOX"));
		folders.add(getFolder(mAccount.getInboxFolderName()));
		return folders;
		}

		@Override
		public void checkSettings() throws MessagingException {
		Pop3Folder folder = new Pop3Folder("INBOX");
		Pop3Folder folder = new Pop3Folder(mAccount.getInboxFolderName());
		folder.open(OpenMode.READ_WRITE);
		if (!mCapabilities.uidl) {
		/*
		@@ -157,8 +157,9 @@ public class Pop3Store extends Store {
		public Pop3Folder(String name) {
		super(Pop3Store.this.mAccount);
		this.mName = name;
		if (mName.equalsIgnoreCase("INBOX")) {
		mName = "INBOX";

		if (mName.equalsIgnoreCase(mAccount.getInboxFolderName())) {
		mName = mAccount.getInboxFolderName();
		}
		}

		@@ -168,7 +169,7 @@ public class Pop3Store extends Store {
		return;
		}

		if (!mName.equalsIgnoreCase("INBOX")) {
		if (!mName.equalsIgnoreCase(mAccount.getInboxFolderName())) {
		throw new MessagingException("Folder does not exist");
		}

		@@ -325,7 +326,7 @@ public class Pop3Store extends Store {

		@Override
		public boolean exists() throws MessagingException {
		return mName.equalsIgnoreCase("INBOX");
		return mName.equalsIgnoreCase(mAccount.getInboxFolderName());
		}

		@Override