Add "Check mail" menu items:

Accounts: Option menu->Check mail = check mail in all
   folders of all accounts
Accounts: Context (long-press on account) menu->Check mail = check mail
   in all folders of this account

Folder/Message List: Option menu->Check mail = check mail in all
   folders of this account
Folder/Message List: Contet (long-press on folder) menu->Check mail = check mail in this
   folder*

*All "Check mail" options, except for the long-press on an individual
folder, respect the normal synchronization class settings.

Eliminate all Refresh menu items.

Add progress indicators to Accounts activity.  Indeterminite progress
indicator while email checking is in progress.  Determinite progress
indicator while fetching unread counts.

res/menu/accounts_context.xml

@@ -2,6 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/open"
         android:title="@string/open_action" />
+    <item android:id="@+id/check_mail"
+        android:title="@string/check_mail_action" />
     <item android:id="@+id/empty_trash"
         android:title="@string/empty_trash_action" />
     <item android:id="@+id/edit_account"

res/menu/accounts_option.xml

@@ -3,7 +3,7 @@
 	<item
 		android:id="@+id/check_mail"
         android:alphabeticShortcut="r"
-		android:title="@string/refresh_action"
+		android:title="@string/check_mail_action"
 		android:icon="@drawable/ic_menu_refresh"
 	/>
 	<item

res/menu/folder_context.xml

@@ -9,10 +9,13 @@
         android:id="@+id/empty_trash"
         android:title="@string/empty_trash_action"
     />
-
     <item
-        android:id="@+id/refresh"
+        android:id="@+id/check_mail"
-        android:title="@string/refresh_action"
+        android:title="@string/check_mail_action"
+    />
+    <item
+        android:id="@+id/send_messages"
+        android:title="@string/send_messages_action"
     />
        <item       
         android:id="@+id/folder_settings"

res/menu/folder_message_list_option.xml

@@ -44,15 +44,20 @@
 		android:icon="@drawable/ic_menu_reverse_sort"
 	/>
 	<item
-		android:id="@+id/refresh"
+		android:id="@+id/check_mail"
         android:alphabeticShortcut="r"
-		android:title="@string/refresh_action"
+		android:title="@string/check_mail_action"
 		android:icon="@drawable/ic_menu_refresh"
 	/>
     <item
 		android:id="@+id/accounts"
 		android:title="@string/accounts_action"
 		android:icon="@drawable/ic_menu_account_list"
+	/>
+	<item
+		android:id="@+id/list_folders"
+		android:title="@string/list_folders_action"
+		android:icon="@drawable/ic_menu_refresh"
 	/>
 		<item
 		android:id="@+id/empty_trash"

res/values/strings.xml

@@ -11,7 +11,7 @@
     <string name="read_attachment_desc">Allows this application to read your Email attachments.</string>
 
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="accounts_title">Your accounts</string>
+    <string name="accounts_title">Accounts</string>
     <string name="compose_title">Compose</string>
     <string name="debug_title">Debug</string>
     <string name="choose_folder_title">Choose Folder</string>
@@ -32,6 +32,9 @@
     <string name="save_draft_action">Save as draft</string>
     <string name="retry_action">Retry</string>
     <string name="refresh_action">Refresh</string>
+    <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="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>
@@ -130,6 +133,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source email client for Android based
 \n
 \nK-9's improved features include: 
  * Better performance
+ * Message refiling
  * Email signatures
  * Bcc-to-self
  * Folder subscriptions

src/com/android/email/Email.java

@@ -119,6 +119,8 @@ public class Email extends Application {
      */
     public static final int WAKE_LOCK_TIMEOUT = 600000;
     
+    public static final int MANUAL_WAKE_LOCK_TIMEOUT = 120000;
+
     /**
      * LED color used for the new email notitication
      */

src/com/android/email/MessagingController.java

@@ -26,7 +26,9 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.os.PowerManager;
 import android.os.Process;
+import android.os.PowerManager.WakeLock;
 import android.util.Config;
 import android.util.Log;
 
@@ -756,12 +758,6 @@ public class MessagingController implements Runnable {
                     remoteUidMap.put(message.getUid(), message);
                 }
 
-
-                
-                
-                
-                
-                
                 /*
                  * Get a list of the messages that are in the remote list but not on the
                  * local store, or messages that are in the local store but failed to download
@@ -781,8 +777,6 @@ public class MessagingController implements Runnable {
                 }
             }
 
-
-
             /*
              * A list of messages that were downloaded and which did not have the Seen flag set.
              * This will serve to indicate the true "new" message count that will be reported to
@@ -2443,8 +2437,6 @@ s             * critical data as fast as possible, and then we'll fill in the de
   	   
   	}
    
-    
-    
     /**
      * Checks mail for one or multiple accounts. If account is null all accounts
      * are checked.
@@ -2454,8 +2446,18 @@ s             * critical data as fast as possible, and then we'll fill in the de
      * @param listener
      */
     public void checkMail(final Context context, final Account account, 
+            final boolean ignoreLastCheckedTime,
+            final boolean useManualWakeLock,
             final MessagingListener listener) {
     	
+      if (useManualWakeLock) {
+        PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+        WakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Email");
+        wakeLock.setReferenceCounted(false);
+        wakeLock.acquire(Email.MANUAL_WAKE_LOCK_TIMEOUT);
+      }
+      
+      
         for (MessagingListener l : getListeners()) {
             l.checkMailStarted(context, account);
         }
@@ -2480,7 +2482,7 @@ s             * critical data as fast as possible, and then we'll fill in the de
 
 	                for (final Account account : accounts) {
 	                  	final long accountInterval = account.getAutomaticCheckIntervalMinutes() * 60 * 1000;
-	                  	if (accountInterval <= 0)
+	                  	if (ignoreLastCheckedTime == false && accountInterval <= 0)
 	                  	{
 		                  	if (Config.LOGV || true)
 		                  	{
@@ -2582,7 +2584,7 @@ s             * critical data as fast as possible, and then we'll fill in the de
 		                    				new Date(folder.getLastChecked()));
 		                    	}
 		                    	
-		                    	if (folder.getLastChecked() > 
+		                    	if (ignoreLastCheckedTime == false && folder.getLastChecked() > 
 		                    		(System.currentTimeMillis() - accountInterval))
 		                    	{
 			                    		if (Config.LOGV) {
@@ -2603,7 +2605,7 @@ s             * critical data as fast as possible, and then we'll fill in the de
 				                    		LocalFolder tLocalFolder = (LocalFolder) localStore.getFolder(folder.getName());
 				                    		tLocalFolder.open(Folder.OpenMode.READ_WRITE);
 				                    						                    		
-				                    		if (tLocalFolder.getLastChecked() > 
+				                    		if (ignoreLastCheckedTime == false && tLocalFolder.getLastChecked() > 
 				                    			    (System.currentTimeMillis() - accountInterval))
 				                    		{
 				                    			if (Config.LOGV) {

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

@@ -15,6 +15,8 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -52,6 +54,8 @@ import com.android.email.mail.store.LocalStore.LocalFolder;
 public class Accounts extends ListActivity implements OnItemClickListener, OnClickListener {
     private static final int DIALOG_REMOVE_ACCOUNT = 1;
     private ConcurrentHashMap<String, Integer> unreadMessageCounts = new ConcurrentHashMap<String, Integer>();
+    
+    private ConcurrentHashMap<Account, String> pendingWork = new ConcurrentHashMap<Account, String>();
     /**
      * Key codes used to open a debug settings screen.
      */
@@ -77,6 +81,9 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
       private static final int DATA_CHANGED = 1;
       private static final int MSG_ACCOUNT_SIZE_CHANGED = 2;
       private static final int MSG_WORKING_ACCOUNT = 3;
+      private static final int MSG_PROGRESS = 4;
+      private static final int MSG_FOLDER_SYNCING = 5;
+      private static final int MSG_DEFINITE_PROGRESS = 6;
 
       public void handleMessage(android.os.Message msg)
       {
@@ -111,6 +118,26 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
             toast.show();
             break;
           }
+          case MSG_FOLDER_SYNCING:
+          {
+            String folderName = (String) ((Object[]) msg.obj)[0];
+            String dispString;
+            dispString = getString(R.string.accounts_title);
+            if (folderName != null)
+            {
+              dispString += " (" + getString(R.string.status_loading)
+              + folderName + ")";
+            }
+            setTitle(dispString);
+            break;
+          }
+          case MSG_PROGRESS:
+            setProgressBarIndeterminateVisibility(msg.arg1 != 0);
+            //setProgressBarVisibility(msg.arg1 != 0);
+            break;          
+          case MSG_DEFINITE_PROGRESS:
+            getWindow().setFeatureInt(Window.FEATURE_PROGRESS, msg.arg1);
+              break;
           default:
             super.handleMessage(msg);
         }
@@ -143,6 +170,29 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
               sendMessage(msg);
       }
       
+      public void progress(boolean progress)
+      {
+              android.os.Message msg = new android.os.Message();
+              msg.what = MSG_PROGRESS;
+              msg.arg1 = progress ? 1 : 0;
+              sendMessage(msg);
+      }
+      public void progress(int progress)
+      {
+              android.os.Message msg = new android.os.Message();
+              msg.what = MSG_DEFINITE_PROGRESS;
+              msg.arg1 = progress ;
+              sendMessage(msg);
+      }
+      public void folderSyncing(String folder)
+      {
+              android.os.Message msg = new android.os.Message();
+        msg.what = MSG_FOLDER_SYNCING;
+        msg.obj = new String[]
+        { folder };
+              sendMessage(msg);
+          }
+
     }
     
     MessagingListener mListener = new MessagingListener() {
@@ -151,6 +201,17 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
       {
         unreadMessageCounts.put(account.getUuid(), unreadMessageCount);
         mHandler.dataChanged();
+        pendingWork.remove(account);
+       
+
+        if (pendingWork.isEmpty())
+        {
+          mHandler.progress(Window.PROGRESS_END);
+        }
+        else {
+          int level = (Window.PROGRESS_END / mAdapter.getCount()) * (mAdapter.getCount() - pendingWork.size()) ;
+          mHandler.progress(level);
+        }
       }
       
       @Override
@@ -168,7 +229,27 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
           int totalMessagesInMailbox,
           int numNewMessages) {
         MessagingController.getInstance(getApplication()).getAccountUnreadCount(Accounts.this, account, mListener);
+
+        mHandler.progress(false);
+        mHandler.folderSyncing(null);
       }
+      
+      @Override
+      public void synchronizeMailboxStarted(Account account, String folder)
+      {
+        mHandler.progress(true);
+        mHandler.folderSyncing(account.getDescription()
+            + getString(R.string.notification_bg_title_separator) + folder);
+      }
+
+            @Override
+      public void synchronizeMailboxFailed(Account account, String folder,
+          String message)
+      {
+            mHandler.progress(false);
+            mHandler.folderSyncing(null);
+       }
+
     };
 
     private static String UNREAD_MESSAGE_COUNTS = "unreadMessageCounts";
@@ -176,6 +257,10 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+
+        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+        requestWindowFeature(Window.FEATURE_PROGRESS);
+        
         setContentView(R.layout.accounts);
         ListView listView = getListView();
         listView.setOnItemClickListener(this);
@@ -226,10 +311,14 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
         Account[] accounts = Preferences.getPreferences(this).getAccounts();
         mAdapter = new AccountsAdapter(accounts);
         getListView().setAdapter(mAdapter);
+        if (accounts.length > 0) {
+          mHandler.progress(Window.PROGRESS_START);
+        }
         
         for (Account account : accounts)
         {
           MessagingController.getInstance(getApplication()).getAccountUnreadCount(Accounts.this, account, mListener);
+          pendingWork.put(account, "true");
         }
         
     }
@@ -242,8 +331,9 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
         AccountSettings.actionSettings(this, account);
     }
 
-    private void onRefresh() {
+    private void onCheckMail(Account account) {
-        MessagingController.getInstance(getApplication()).checkMail(this, null, null);
+
+        MessagingController.getInstance(getApplication()).checkMail(this, account, true, true, null);
     }
     
     private void onClearCommands(Account account) {
@@ -268,7 +358,9 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
     }
 
     private void onOpenAccount(Account account) {
-        FolderMessageList.actionHandleAccount(this, account, Email.INBOX);
+      //FolderMessageList.actionHandleAccount(this, account);  // Dan's way
+
+         FolderMessageList.actionHandleAccount(this, account, Email.INBOX);  // Everbody else's way
     }
 
     public void onClick(View view) {
@@ -332,6 +424,9 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
             case R.id.open:
                 onOpenAccount(account);
                 break;
+            case R.id.check_mail:
+              onCheckMail(account);
+              break;
             case R.id.clear_pending:
               onClearCommands(account);
               break;
@@ -373,7 +468,7 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
                 onAddNewAccount();
                 break;
             case R.id.check_mail:
-                onRefresh();
+                onCheckMail(null);
                 break;
             case R.id.compose:
                 onCompose();

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

@@ -1119,6 +1119,16 @@ public class FolderMessageList extends ExpandableListActivity
         holder.message.getFolder().getName(), holder.uid, Flag.FLAGGED, !holder.flagged);
         holder.flagged = !holder.flagged;
         mHandler.dataChanged();
+    }
+	
+	 private void checkMail(final Account account)
+	  {
+	    MessagingController.getInstance(getApplication()).checkMail(this, account, true, true, mAdapter.mListener);
+	  }
+	private void checkMail(Account account, String folderName)
+	{
+    MessagingController.getInstance(getApplication()).synchronizeMailbox(
+        account, folderName, mAdapter.mListener);
 	}
 	
     @Override
@@ -1126,7 +1136,10 @@ public class FolderMessageList extends ExpandableListActivity
 	{
 		switch (item.getItemId())
 		{
-            case R.id.refresh:
+            case R.id.check_mail:
+                checkMail(mAccount);
+                return true;
+            case R.id.list_folders:
               onRefresh(true);
               return true;
             case R.id.accounts:
@@ -1247,18 +1260,13 @@ public class FolderMessageList extends ExpandableListActivity
 		{
 			switch (item.getItemId())
 			{
-				case R.id.refresh:
+			  case R.id.send_messages:
-					if (folder.outbox)
-					{
 			    Log.i(Email.LOG_TAG, "sending pending messages from " + folder.name);
-							MessagingController.getInstance(getApplication())
+          MessagingController.getInstance(getApplication()).sendPendingMessages(mAccount, null);
-							.sendPendingMessages(mAccount, null);
+          break;
-					}
+        case R.id.check_mail:
-					else
-					{
 						Log.i(Email.LOG_TAG, "refresh folder " + folder.name);
 						new Thread(new FolderUpdateWorker(folder.name, true)).start();
-					}
 					break;
 				case R.id.folder_settings:
 					Log.i(Email.LOG_TAG, "edit folder settings for " + folder.name);
@@ -1340,6 +1348,13 @@ public class FolderMessageList extends ExpandableListActivity
 			if (!folder.name.equals(mAccount.getTrashFolderName()))
 			{
 				menu.findItem(R.id.empty_trash).setVisible(false);
+        }
+			if (folder.outbox)
+			{
+        menu.findItem(R.id.check_mail).setVisible(false);
+			}
+			else {
+        menu.findItem(R.id.send_messages).setVisible(false);
 			}
 			menu.setHeaderTitle(R.string.folder_context_menu_title);
     }

src/com/android/email/service/MailService.java

@@ -85,7 +85,7 @@ public class MailService extends Service {
 
               mListener.wakeLockAcquire();
               controller.setCheckMailListener(mListener);
-              controller.checkMail(this, null, mListener);
+              controller.checkMail(this, null, false, false, mListener);
             }
             else
             {
@@ -157,9 +157,18 @@ public class MailService extends Service {
 	        long delay = (shortestInterval * (60 * 1000));
 
 	        long nextTime = System.currentTimeMillis() + delay;
+	        try
+	        {
 	          String checkString = "Next check for package " + getApplication().getPackageName() + " scheduled for " + new Date(nextTime);
 	          Log.v(Email.LOG_TAG, checkString);
 	          MessagingController.getInstance(getApplication()).log(checkString);
+	        }
+	        catch (Exception e)
+	        {
+	          // I once got a NullPointerException deep in new Date();
+	          Log.e(Email.LOG_TAG, "Exception while logging", e);
+	        }
+	        
 	        alarmMgr.set(AlarmManager.RTC_WAKEUP, nextTime, pi);
         }
 
@@ -235,10 +244,11 @@ public class MailService extends Service {
                 //since only the one that require so are in this map
                 if (accountsWithNewMail.containsKey(thisAccount.getUuid()))
                 {
+		    int unreadMessageCount = 0;
                     String notice = null;
                     try
                     {
-                        int unreadMessageCount = thisAccount.getUnreadMessageCount(context, getApplication());
+                        unreadMessageCount = thisAccount.getUnreadMessageCount(context, getApplication());
                         if (unreadMessageCount > 0)
                         {
                             notice = getString(R.string.notification_new_one_account_fmt, unreadMessageCount,
@@ -259,9 +269,12 @@ public class MailService extends Service {
 
                     Notification notif = new Notification(R.drawable.stat_notify_email_generic,
                         getString(R.string.notification_new_title), System.currentTimeMillis() + (index*1000));
-                    notif.number = (int)accountsWithNewMail.get(thisAccount.getUuid());
+              		    if (unreadMessageCount > 0)
+              		    {
+              			notif.number = unreadMessageCount;
               		    
-                    Intent i = FolderMessageList.actionHandleAccountIntent(context, thisAccount, Email.INBOX);
+
+                    Intent i = FolderMessageList.actionHandleAccountIntent(context, thisAccount);
 
                     PendingIntent pi = PendingIntent.getActivity(context, 0, i, 0);
 
@@ -281,6 +294,11 @@ public class MailService extends Service {
 
                     notifMgr.notify(thisAccount.getAccountNumber(), notif);
               		    }
+              		    else
+              		    {
+              		      notifMgr.cancel(thisAccount.getAccountNumber());
+              		    }
+                }
             }//for accounts
         }//checkMailDone