moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-07 02:30:10 -05:00
Code Issues Releases Wiki Activity

Removed eclipse files that appeared to be user-specific (sorry?)

Browse Source 
Believe this fixes the IMAP prefix issue (27)
Trash still deletes itself, which is technically a separate issue, but now it deletes the *right* trash. :)

Create local branch for IMAP prefix fix (Issue 27)
r110@stilgar:  brock | 2008-11-03 00:08:29 -0500
Fixed IMAP prefix problem.
This commit is contained in:
Brock Tice 2008-11-03 06:12:04 +00:00
parent 62e9447fd9
commit be49a0c707
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.classpath
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="lib" path="/Users/tibbetts/Tarballs/android-sdk-mac_x86-1.0_r1/tools/lib/layoutlib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

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

@ -155,6 +155,7 @@ public class ImapStore extends Store {
if ((uri.getPath() != null) && (uri.getPath().length() > 0)) { if ((uri.getPath() != null) && (uri.getPath().length() > 0)) {
mPathPrefix = uri.getPath().substring(1); mPathPrefix = uri.getPath().substring(1);
Log.i(k9.LOG_TAG, "IMAP Prefix is " + mPathPrefix);
} }
mModifiedUtf7Charset = new CharsetProvider().charsetForName("X-RFC-3501"); mModifiedUtf7Charset = new CharsetProvider().charsetForName("X-RFC-3501");
@ -179,16 +180,35 @@ public class ImapStore extends Store {
ImapConnection connection = getConnection(); ImapConnection connection = getConnection();
try { try {
ArrayList<Folder> folders = new ArrayList<Folder>(); ArrayList<Folder> folders = new ArrayList<Folder>();
//TMP: condition ? expression1 : expression2 is equivalent to
//TMP: if(condition) { expression 1 }else{ expression 2 }
if(mPathPrefix == null){ mPathPrefix = ""; }
List<ImapResponse> responses = List<ImapResponse> responses =
connection.executeSimpleCommand(String.format("LIST \"\" \"%s*\"", connection.executeSimpleCommand(String.format("LIST \"\" \"%s*\"",
mPathPrefix == null ? "" : mPathPrefix)); mPathPrefix));
//FIXME: Remove before submitting
Log.i(k9.LOG_TAG, "Using LIST command " + String.format("LIST \"\" \"%s*\"", mPathPrefix));
//TMP: So, that previous line does the following
//TMP: If mPathPrefix is null, nothing is inserted in the string
//TMP: else mPathPrefix is inserted
//TMP: I'd like to see what this is actually doing
for (ImapResponse response : responses) { for (ImapResponse response : responses) {
if (response.get(0).equals("LIST")) { if (response.get(0).equals("LIST")) {
boolean includeFolder = true; boolean includeFolder = true;
String folder = decodeFolderName(response.getString(3)); String folder = decodeFolderName(response.getString(3));
if (folder.equalsIgnoreCase("INBOX")) {
Log.i(k9.LOG_TAG, "Got folder name " + folder);
if (folder.equalsIgnoreCase(k9.INBOX)) {
continue; continue;
} }else{
if(mPathPrefix.length() > 0){
if(folder.length() >= mPathPrefix.length() + 1){
folder = folder.substring(mPathPrefix.length() + 1);
}
}
}
ImapList attributes = response.getList(1); ImapList attributes = response.getList(1);
for (int i = 0, count = attributes.size(); i < count; i++) { for (int i = 0, count = attributes.size(); i < count; i++) {
String attribute = attributes.getString(i); String attribute = attributes.getString(i);
@ -293,7 +313,11 @@ public class ImapStore extends Store {
private boolean mExists; private boolean mExists;
public ImapFolder(String name) { public ImapFolder(String name) {
this.mName = name; this.mName = "";
if(!name.equalsIgnoreCase(mPathPrefix) && mPathPrefix.length() > 0){
this.mName += mPathPrefix + ".";
}
this.mName += name;
} }
public void open(OpenMode mode) throws MessagingException { public void open(OpenMode mode) throws MessagingException {