moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix bug introduced with commit b7a6dbd973 

Fixes issue 3297
This commit is contained in:
cketti 2011-05-15 16:23:53 +02:00 committed by Jesse Vincent
parent f54ab14fce
commit 5269bc6563
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -377,9 +377,9 @@ public class ImapStore extends Store {
if (ImapResponseParser.equalsIgnoreCase(response.get(0), commandResponse)) {
boolean includeFolder = true;
String folder;
String decodedFolderName;
try {
folder = decodeFolderName(response.getString(3));
decodedFolderName = decodeFolderName(response.getString(3));
} catch (CharacterCodingException e) {
Log.w(K9.LOG_TAG, "Folder name not correctly encoded with the UTF-7 variant " +
"as defined by RFC 3501: " + response.getString(3), e);
@ -391,6 +391,8 @@ public class ImapStore extends Store {
continue;
}
String folder = decodedFolderName;
if (mPathDelimeter == null) {
mPathDelimeter = response.getString(2);
mCombinedPrefix = null;
@ -406,12 +408,13 @@ public class ImapStore extends Store {
*/
continue;
} else {
if (getCombinedPrefix().length() > 0) {
if (folder.length() >= getCombinedPrefix().length()) {
folder = folder.substring(getCombinedPrefix().length());
int prefixLength = getCombinedPrefix().length();
if (prefixLength > 0) {
// Strip prefix from the folder name
if (folder.length() >= prefixLength) {
folder = folder.substring(prefixLength);
}
if (!folder.equalsIgnoreCase(getCombinedPrefix() + folder)) {
if (!decodedFolderName.equalsIgnoreCase(getCombinedPrefix() + folder)) {
includeFolder = false;
}
}