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

improve the MessageList->FolderList flow. Should fix Issue 916

Browse Source
This commit is contained in:
Jesse Vincent 2009-12-16 05:26:43 +00:00
parent f318a6e481
commit 9ae7934cad
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/fsck/k9/activity/FolderList.java
View File

@ -349,11 +349,11 @@ public class FolderList extends K9ListActivity
} }
Log.v(K9.LOG_TAG, "mInitialFolder: " + initialFolder); Log.v(K9.LOG_TAG, "mInitialFolder: " + initialFolder);
if (initialFolder != null if (mStartup
&& initialFolder != null
&& !K9.FOLDER_NONE.equals(initialFolder)) && !K9.FOLDER_NONE.equals(initialFolder))
{ {
onOpenFolder(initialFolder, true); onOpenFolder(initialFolder, true);
finish();
} }
else else
{ {
@ -370,6 +370,7 @@ public class FolderList extends K9ListActivity
{ {
Log.v(K9.LOG_TAG,"We're clicking "+itemPosition+" -- "+id); Log.v(K9.LOG_TAG,"We're clicking "+itemPosition+" -- "+id);
MessageList.actionHandleFolder(FolderList.this, mAccount, ((FolderInfoHolder)mAdapter.getItem(id)).name, false); MessageList.actionHandleFolder(FolderList.this, mAccount, ((FolderInfoHolder)mAdapter.getItem(id)).name, false);
finish();
} }
}); });
registerForContextMenu(mListView); registerForContextMenu(mListView);
@ -585,6 +586,7 @@ public class FolderList extends K9ListActivity
private void onOpenFolder(String folder, boolean startup) private void onOpenFolder(String folder, boolean startup)
{ {
MessageList.actionHandleFolder(this, mAccount, folder, startup); MessageList.actionHandleFolder(this, mAccount, folder, startup);
finish();
} }
private void onCompact(Account account) private void onCompact(Account account)

4
src/com/fsck/k9/activity/MessageList.java
View File

@ -775,12 +775,8 @@ public class MessageList
} }
private void onShowFolderList() private void onShowFolderList()
{
if (mStartup || isTaskRoot())
{ {
FolderList.actionHandleAccount(this, mAccount, false); FolderList.actionHandleAccount(this, mAccount, false);
}
finish(); finish();
} }