Cleanup of minor issues with r395. r395 and this revision are to

address Issue 2, not Issue 3 as previously stated.
This commit is contained in:
Daniel Applebaum 2009-03-05 07:50:53 +00:00
parent 15e5cb4eaf
commit 7b2a754009
3 changed files with 12 additions and 4 deletions

View File

@ -145,7 +145,7 @@ public class ChooseFolder extends ListActivity
{
return;
}
// mHandler.progress(false);
mHandler.progress(false);
}
@Override
@ -155,7 +155,7 @@ public class ChooseFolder extends ListActivity
{
return;
}
// mHandler.progress(false);
mHandler.progress(false);
}
@Override
public void listFolders(Account account, Folder[] folders)

View File

@ -947,7 +947,7 @@ public class FolderMessageList extends ExpandableListActivity
{
return;
}
if (MessagingController.getInstance(getApplication()).isMoveCapable(holder.message) == false)
if (MessagingController.getInstance(getApplication()).isCopyCapable(holder.message) == false)
{
Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
toast.show();

View File

@ -596,6 +596,10 @@ public class MessageView extends Activity
private void onMove()
{
if (MessagingController.getInstance(getApplication()).isMoveCapable(mAccount) == false)
{
return;
}
if (MessagingController.getInstance(getApplication()).isMoveCapable(mMessage) == false)
{
Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
@ -611,7 +615,11 @@ public class MessageView extends Activity
private void onCopy()
{
if (MessagingController.getInstance(getApplication()).isMoveCapable(mMessage) == false)
if (MessagingController.getInstance(getApplication()).isCopyCapable(mAccount) == false)
{
return;
}
if (MessagingController.getInstance(getApplication()).isCopyCapable(mMessage) == false)
{
Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
toast.show();