Fixed issue 496

Note: No putting 'Account Settints' and 'Accounts' menu option on MessageList as it does not belong there
TODO: Add more menu options: Mark All As Read, Folder Settings, etc...

res/menu/folder_list_option.xml

@@ -13,7 +13,7 @@
 	/>
 	<item
 		android:id="@+id/list_folders"
-		android:title="@string/list_folders_action"
+		android:title="@string/refresh_folders_action"
 		android:icon="@drawable/ic_menu_refresh"
 	/>
 	<item

res/menu/message_list_option.xml

@@ -6,11 +6,22 @@
 		android:title="@string/compose_action"
 		android:icon="@drawable/ic_menu_compose"
 	/>
+    <item
+        android:id="@+id/list_folders"
+        android:alphabeticShortcut="f"
+		android:title="@string/list_folders_action"
+		android:icon="@drawable/ic_menu_navigate"
+    />
+	<item
+		android:id="@+id/check_mail"
+        android:alphabeticShortcut="r"
+		android:title="@string/check_mail_action"
+		android:icon="@drawable/ic_menu_refresh"
+	/>
 	<item
 		android:id="@+id/set_sort"
 		android:title="@string/sort_by"
 		android:icon="@drawable/ic_menu_set_sort">
-		
 		<menu>
 			<item
 				android:id="@+id/set_sort_date"
@@ -38,12 +49,6 @@
 			/>
 		</menu>
 	</item>
-	<item
-		android:id="@+id/check_mail"
-        android:alphabeticShortcut="r"
-		android:title="@string/check_mail_action"
-		android:icon="@drawable/ic_menu_refresh"
-	/>
     <item
 		android:id="@+id/reverse_sort"
 		android:title="@string/reverse_sort_action"

res/values/strings.xml

@@ -38,6 +38,7 @@
     <string name="check_mail_action">Check mail</string>
     <string name="send_messages_action">Send messages</string>
     <string name="list_folders_action">List folders</string>
+    <string name="refresh_folders_action">Refresh folders</string>
     <string name="mark_all_as_read_action">Mark all messages as read</string> 
     <string name="add_account_action">Add account</string>
     <string name="compose_action">Compose</string>

src/com/android/email/activity/Accounts.java

@@ -272,34 +272,33 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
         Account[] accounts = Preferences.getPreferences(this).getAccounts();
         Intent intent = getIntent();
-        boolean startup =(boolean)intent.getBooleanExtra(EXTRA_STARTUP, false);
+        boolean startup = (boolean)intent.getBooleanExtra(EXTRA_STARTUP, false);
-
+        if (startup && accounts.length == 1) {
-
+            FolderList.actionHandleAccount(this, accounts[0], accounts[0].getAutoExpandFolderName(), true);
-
+            finish();
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        requestWindowFeature(Window.FEATURE_PROGRESS);
-        
-        setContentView(R.layout.accounts);
-        ListView listView = getListView();
-        listView.setOnItemClickListener(this);
-        listView.setItemsCanFocus(false);
-        listView.setEmptyView(findViewById(R.id.empty));
-        findViewById(R.id.add_new_account).setOnClickListener(this);
-        registerForContextMenu(listView);
-
-        if (icicle != null && icicle.containsKey(SELECTED_CONTEXT_ACCOUNT)) {
-            mSelectedContextAccount = (Account) icicle.getSerializable("selectedContextAccount");
         }
-        
+        else {
-        if (icicle != null) {
+            requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-          Map<String, Integer> oldUnreadMessageCounts = (Map<String, Integer>)icicle.get(UNREAD_MESSAGE_COUNTS);
+            requestWindowFeature(Window.FEATURE_PROGRESS);
-          if (oldUnreadMessageCounts != null) {
+
-            unreadMessageCounts.putAll(oldUnreadMessageCounts);
+            setContentView(R.layout.accounts);
-          }
+            ListView listView = getListView();
-        }
+            listView.setOnItemClickListener(this);
-       if (startup && accounts.length == 1) {
+            listView.setItemsCanFocus(false);
-            intent.putExtra(EXTRA_STARTUP, false);
+            listView.setEmptyView(findViewById(R.id.empty));
-            FolderList.actionHandleAccount(this, accounts[0], accounts[0].getAutoExpandFolderName());
+            findViewById(R.id.add_new_account).setOnClickListener(this);
+            registerForContextMenu(listView);
+
+            if (icicle != null && icicle.containsKey(SELECTED_CONTEXT_ACCOUNT)) {
+                mSelectedContextAccount = (Account) icicle.getSerializable("selectedContextAccount");
+            }
+
+            if (icicle != null) {
+                Map<String, Integer> oldUnreadMessageCounts = (Map<String, Integer>)icicle.get(UNREAD_MESSAGE_COUNTS);
+                if (oldUnreadMessageCounts != null) {
+                    unreadMessageCounts.putAll(oldUnreadMessageCounts);
+                }
+            }
         }
     }
 
@@ -378,7 +377,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
     }
 
     private void onOpenAccount(Account account) {
-      FolderList.actionHandleAccount(this, account);
+      FolderList.actionHandleAccount(this, account, true);
     }
 
     public void onClick(View view) {

src/com/android/email/activity/FolderList.java

@@ -4,18 +4,11 @@ import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
 import com.android.email.K9ListActivity;
 import android.app.NotificationManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -35,9 +28,7 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.BaseAdapter;
 import android.widget.AdapterView;
-import android.widget.Button;
 import android.widget.ListView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -47,22 +38,16 @@ import com.android.email.MessagingController;
 import com.android.email.MessagingListener;
 import com.android.email.Preferences;
 import com.android.email.R;
-import com.android.email.Utility;
 import com.android.email.MessagingController.SORT_TYPE;
 import com.android.email.activity.FolderList.FolderInfoHolder;
 import com.android.email.activity.MessageList.MessageInfoHolder;
 import com.android.email.activity.setup.AccountSettings;
 import com.android.email.activity.setup.FolderSettings;
-import com.android.email.mail.Address;
-import com.android.email.mail.Flag;
 import com.android.email.mail.Folder;
 import com.android.email.mail.Message;
 import com.android.email.mail.MessagingException;
 import com.android.email.mail.Store;
-import com.android.email.mail.Message.RecipientType;
-import com.android.email.mail.store.LocalStore;
 import com.android.email.mail.store.LocalStore.LocalFolder;
-import com.android.email.mail.store.LocalStore.LocalMessage;
 
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
@@ -87,6 +72,8 @@ public class FolderList extends K9ListActivity {
 
     private static final String EXTRA_CLEAR_NOTIFICATION = "clearNotification";
 
+    private static final String EXTRA_STARTUP = "startup";
+
     private static final boolean REFRESH_REMOTE = true;
 
     private ListView mListView;
@@ -344,9 +331,10 @@ public class FolderList extends K9ListActivity {
         }
     }
 
-    public static void actionHandleAccount(Context context, Account account, String initialFolder) {
+    private static void actionHandleAccount(Context context, Account account, String initialFolder, boolean startup) {
         Intent intent = new Intent(context, FolderList.class);
         intent.putExtra(EXTRA_ACCOUNT, account);
+        intent.putExtra(EXTRA_STARTUP, startup);
 
         if (initialFolder != null) {
             intent.putExtra(EXTRA_INITIAL_FOLDER, initialFolder);
@@ -355,8 +343,16 @@ public class FolderList extends K9ListActivity {
         context.startActivity(intent);
     }
 
+    public static void actionHandleAccount(Context context, Account account, String initialFolder) {
+        actionHandleAccount(context, account, null, false);
+    }
+
+    public static void actionHandleAccount(Context context, Account account, boolean startup) {
+        actionHandleAccount(context, account, null, startup);
+    }
+
     public static void actionHandleAccount(Context context, Account account) {
-        actionHandleAccount(context, account, null);
+        actionHandleAccount(context, account, null, false);
     }
 
     public static Intent actionHandleAccountIntent(Context context, Account account, String initialFolder) {
@@ -378,68 +374,77 @@ public class FolderList extends K9ListActivity {
     @Override public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-
-        final FolderList xxx = this;
-
-        mListView = getListView();
-        mListView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_INSET);
-        mListView.setLongClickable(true);
-        //mListView.setFastScrollEnabled(true); // XXX TODO - reenable when we switch to 1.5
-        mListView.setScrollingCacheEnabled(true);
-        mListView.setOnItemClickListener(new OnItemClickListener() {
-            public void onItemClick(AdapterView parent, View v, int itemPosition, long id){
-                Log.v(Email.LOG_TAG,"We're clicking "+itemPosition+" -- "+id);
-                    MessageList.actionHandleFolder(xxx,mAccount, ((FolderInfoHolder)mAdapter.getItem(id)).name);
-            }
-
-
-        });
-        registerForContextMenu(mListView);
-
-        /*
-        * We manually save and restore the list's state because our adapter is
-        * slow.
-         */
-        mListView.setSaveEnabled(false);
-
-        mInflater = getLayoutInflater();
-
         Intent intent = getIntent();
         mAccount = (Account)intent.getSerializableExtra(EXTRA_ACCOUNT);
-
+        Log.v(Email.LOG_TAG, "savedInstanceState: " + (savedInstanceState==null));
         if (savedInstanceState == null) {
             mInitialFolder = intent.getStringExtra(EXTRA_INITIAL_FOLDER);
-
+            Log.v(Email.LOG_TAG, "EXTRA_INITIAL_FOLDER: " + mInitialFolder);
-            if (mInitialFolder == null) {
+            boolean startup = (boolean) intent.getBooleanExtra(EXTRA_STARTUP, false);
+            Log.v(Email.LOG_TAG, "startup: " + startup);
+            if (mInitialFolder == null
+                && startup) {
                 mInitialFolder = mAccount.getAutoExpandFolderName();
                 if (Email.FOLDER_NONE.equals(mInitialFolder)) {
                     mInitialFolder = null;
                 }
             }
         }
-
+        else {
-
+            mInitialFolder = null;
-        mAdapter = new FolderListAdapter();
-
-        final Object previousData = getLastNonConfigurationInstance();
-
-        if (previousData != null) {
-            //noinspection unchecked
-            mAdapter.mFolders = (ArrayList<FolderInfoHolder>) previousData;
         }
 
-        setListAdapter(mAdapter);
+        Log.v(Email.LOG_TAG, "mInitialFolder: " + mInitialFolder);
-
-        if (savedInstanceState != null) {
-            mRestoringState = true;
-            //onRestoreListState(savedInstanceState);
-            mRestoringState = false;
-        }
-
-        setTitle(mAccount.getDescription());
         if (mInitialFolder != null) {
-            onOpenFolder(mInitialFolder); 
+            onOpenFolder(mInitialFolder);
+            finish();
+        }
+        else {
+            requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+
+            final FolderList xxx = this;
+
+            mListView = getListView();
+            mListView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_INSET);
+            mListView.setLongClickable(true);
+            //mListView.setFastScrollEnabled(true); // XXX TODO - reenable when we switch to 1.5
+            mListView.setScrollingCacheEnabled(true);
+            mListView.setOnItemClickListener(new OnItemClickListener() {
+                public void onItemClick(AdapterView parent, View v, int itemPosition, long id){
+                    Log.v(Email.LOG_TAG,"We're clicking "+itemPosition+" -- "+id);
+                        MessageList.actionHandleFolder(xxx,mAccount, ((FolderInfoHolder)mAdapter.getItem(id)).name);
+                }
+
+
+            });
+            registerForContextMenu(mListView);
+
+            /*
+            * We manually save and restore the list's state because our adapter is
+            * slow.
+             */
+            mListView.setSaveEnabled(false);
+
+            mInflater = getLayoutInflater();
+
+            mAdapter = new FolderListAdapter();
+
+            final Object previousData = getLastNonConfigurationInstance();
+
+            if (previousData != null) {
+                //noinspection unchecked
+                mAdapter.mFolders = (ArrayList<FolderInfoHolder>) previousData;
+            }
+
+            setListAdapter(mAdapter);
+
+            if (savedInstanceState != null) {
+                mRestoringState = true;
+                //onRestoreListState(savedInstanceState);
+                mRestoringState = false;
+            }
+
+            setTitle(mAccount.getDescription());
         }
     }
 
@@ -638,7 +643,7 @@ public class FolderList extends K9ListActivity {
         case R.id.open_folder:
             onOpenFolder(folder);
             break;
-
+        
         case R.id.send_messages:
             Log.i(Email.LOG_TAG, "sending pending messages from " + folder.name);
 

src/com/android/email/activity/MessageList.java

@@ -966,6 +966,12 @@ public class MessageList extends K9ListActivity {
 
             return true;
 
+        case R.id.list_folders:
+            FolderList.actionHandleAccount(this, mAccount);
+            finish();
+            
+            return true;
+            
         default:
             return super.onOptionsItemSelected(item);
         }