moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes issue 1199

This commit is contained in:
cketti 2010-02-09 15:41:40 +00:00
parent 03a06696dc
commit 80ae0402e5
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@ -671,9 +671,10 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="remote_control_label">K-9 Mail remote control</string>
<string name="remote_control_desc">Allows this application to control K-9 Mail activities and settings.</string>
<string name="account_setup_store_attachment_on_sd_card_label">Attachments On SD Cards</string>
<string name="account_setup_store_attachment_on_sd_card_summary">Whether or not attachments are store on the SD card</string>
<string name="account_setup_store_attachment_on_sd_card_label">Attachments on SD card</string>
<string name="account_setup_store_attachment_on_sd_card_summary">Whether or not attachments are stored on the SD card</string>
<string name="account_setup_store_attachment_on_sd_card_error">No SD card found</string>
<string name="sd_card_error">No SD card found</string>
<string name="sd_card_skip">No SD card found. Skipping accounts with 'Attachments on SD card' enabled.</string>
</resources>

28
src/com/fsck/k9/activity/Accounts.java
View File

@ -376,13 +376,33 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
}
/*
* This method is called with 'null' for the argument 'account' if
* all accounts are to be checked. This is handled accordingly in
* MessagingController.checkMail().
*/
private void onCheckMail(Account account)
{
if (account.isStoreAttachmentOnSdCard()
&& !Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED))
if (account != null)
{
Toast.makeText(this, R.string.sd_card_error, Toast.LENGTH_SHORT).show();
return;
if (account.isStoreAttachmentOnSdCard()
&& !Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED))
{
Toast.makeText(this, R.string.sd_card_error, Toast.LENGTH_SHORT).show();
return;
}
}
else
{
Account[] accounts = Preferences.getPreferences(this).getAccounts();
for (Account acc : accounts)
{
if (acc.isStoreAttachmentOnSdCard())
{
Toast.makeText(this, R.string.sd_card_skip, Toast.LENGTH_LONG).show();
break;
}
}
}
MessagingController.getInstance(getApplication()).checkMail(this, account, true, true, null);