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

astyle

This commit is contained in:
Jesse Vincent 2010-07-22 03:40:30 +00:00
parent eb21807384
commit 80e134c03c
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ public class ChooseAccount extends K9ExpandableListActivity
{
@Override
public boolean onChildClick(ExpandableListView parent, View v, int groupPosition,
int childPosition, long id)
int childPosition, long id)
{
final Identity identity = (Identity) adapter.getChild(groupPosition, childPosition);
final Account account = (Account) adapter.getGroup(groupPosition);
@ -175,7 +175,7 @@ public class ChooseAccount extends K9ExpandableListActivity
@Override
public View getGroupView(int groupPosition, boolean isExpanded, View convertView,
ViewGroup parent)
ViewGroup parent)
{
final View v;
if (convertView == null)
@ -200,7 +200,7 @@ public class ChooseAccount extends K9ExpandableListActivity
@Override
public View getChildView(int groupPosition, int childPosition, boolean isLastChild,
View convertView, ViewGroup parent)
View convertView, ViewGroup parent)
{
final Account account = getAccounts()[groupPosition];
final Identity identity = account.getIdentity(childPosition);

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

@ -90,13 +90,13 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
private static final int ACTIVITY_CHOOSE_ACCOUNT = 3;
/**
* The account used for message composition.
* The account used for message composition.
*/
private Account mAccount;
/**
* This identity's settings are used for message composition.
* Note: This has to be an identity of the account {@link #mAccount}.
* Note: This has to be an identity of the account {@link #mAccount}.
*/
private Identity mIdentity;
@ -284,8 +284,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
mMessageReference = (MessageReference) intent.getSerializableExtra(EXTRA_MESSAGE_REFERENCE);
final String accountUuid = (mMessageReference != null) ?
mMessageReference.accountUuid :
intent.getStringExtra(EXTRA_ACCOUNT);
mMessageReference.accountUuid :
intent.getStringExtra(EXTRA_ACCOUNT);
mAccount = Preferences.getPreferences(this).getAccount(accountUuid);
@ -555,9 +555,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
updateSignature();
if (ACTION_REPLY.equals(action) ||
ACTION_REPLY_ALL.equals(action) ||
ACTION_FORWARD.equals(action) ||
ACTION_EDIT_DRAFT.equals(action))
ACTION_REPLY_ALL.equals(action) ||
ACTION_FORWARD.equals(action) ||
ACTION_EDIT_DRAFT.equals(action))
{
/*
* If we need to load the message we add ourself as a message listener here
@ -588,7 +588,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
*/
if (ACTION_REPLY.equals(action) ||
ACTION_REPLY_ALL.equals(action))
ACTION_REPLY_ALL.equals(action))
{
if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Setting message ANSWERED flag to true");
@ -606,8 +606,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
}
if (ACTION_REPLY.equals(action) ||
ACTION_REPLY_ALL.equals(action) ||
ACTION_EDIT_DRAFT.equals(action))
ACTION_REPLY_ALL.equals(action) ||
ACTION_EDIT_DRAFT.equals(action))
{
//change focus to message body.
mMessageContentView.requestFocus();
@ -1791,8 +1791,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
//TODO: is this really necessary here? mDraftUid is update after the call to MessagingController.saveDraft()
// Track UID changes of the draft message
if (account.equals(mAccount) &&
folder.equals(mAccount.getDraftsFolderName()) &&
oldUid.equals(mDraftUid))
folder.equals(mAccount.getDraftsFolderName()) &&
oldUid.equals(mDraftUid))
{
mDraftUid = newUid;
}
@ -1802,8 +1802,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
{
final Account sourceAccount = Preferences.getPreferences(MessageCompose.this).getAccount(mMessageReference.accountUuid);
final String sourceFolder = mMessageReference.folderName;
final String sourceMessageUid = mMessageReference.uid;
final String sourceMessageUid = mMessageReference.uid;
if (account.equals(sourceAccount) && (folder.equals(sourceFolder)))
{
if (oldUid.equals(sourceMessageUid))

2
src/com/fsck/k9/provider/AttachmentProvider.java
View File

@ -77,7 +77,7 @@ public class AttachmentProvider extends ContentProvider
file.delete();
}
}
return true;
}