From 7030967fa78cfed524559c61c1398e7e3a612308 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 31 Aug 2010 03:58:33 +0000 Subject: [PATCH] astyle --- src/com/fsck/k9/activity/K9ListActivity.java | 16 +- .../fsck/k9/activity/MessageInfoHolder.java | 3 +- src/com/fsck/k9/activity/MessageList.java | 156 +++++++++--------- src/com/fsck/k9/activity/MessageView.java | 10 +- .../k9/activity/setup/AccountSetupBasics.java | 2 +- src/com/fsck/k9/helper/ContactsSdk3_4.java | 10 +- src/com/fsck/k9/helper/ContactsSdk5.java | 10 +- src/com/fsck/k9/mail/Address.java | 24 ++- src/com/fsck/k9/mail/store/LocalStore.java | 13 +- 9 files changed, 132 insertions(+), 112 deletions(-) diff --git a/src/com/fsck/k9/activity/K9ListActivity.java b/src/com/fsck/k9/activity/K9ListActivity.java index c3be5686a..5789f2844 100644 --- a/src/com/fsck/k9/activity/K9ListActivity.java +++ b/src/com/fsck/k9/activity/K9ListActivity.java @@ -54,10 +54,11 @@ public class K9ListActivity extends ListActivity case KeyEvent.KEYCODE_VOLUME_UP: { ListView listView = getListView(); - if(K9.useVolumeKeysForNavigationEnabled()) + if (K9.useVolumeKeysForNavigationEnabled()) { - if (listView.getSelectedItemPosition() > 0) { + if (listView.getSelectedItemPosition() > 0) + { listView.setSelection(listView.getSelectedItemPosition()-1); } return true; @@ -66,9 +67,10 @@ public class K9ListActivity extends ListActivity case KeyEvent.KEYCODE_VOLUME_DOWN: { ListView listView = getListView(); - if(K9.useVolumeKeysForNavigationEnabled()) + if (K9.useVolumeKeysForNavigationEnabled()) { - if (listView.getSelectedItemPosition() < listView.getCount()) { + if (listView.getSelectedItemPosition() < listView.getCount()) + { listView.setSelection(listView.getSelectedItemPosition()+1); } return true; @@ -82,8 +84,10 @@ public class K9ListActivity extends ListActivity public boolean onKeyUp(int keyCode, KeyEvent event) { // Swallow these events too to avoid the audible notification of a volume change - if(K9.useVolumeKeysForNavigationEnabled()) { - if((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) { + if (K9.useVolumeKeysForNavigationEnabled()) + { + if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) + { if (K9.DEBUG) Log.v(K9.LOG_TAG, "Swallowed key up."); return true; diff --git a/src/com/fsck/k9/activity/MessageInfoHolder.java b/src/com/fsck/k9/activity/MessageInfoHolder.java index eabce1a18..1244d5391 100644 --- a/src/com/fsck/k9/activity/MessageInfoHolder.java +++ b/src/com/fsck/k9/activity/MessageInfoHolder.java @@ -141,7 +141,8 @@ public class MessageInfoHolder implements Comparable { CharSequence to = Address.toFriendly(message .getRecipients(RecipientType.TO), mContacts); this.compareCounterparty = to.toString(); - this.sender = new SpannableStringBuilder(context.getString(R.string.message_list_to_fmt)).append(to); } + this.sender = new SpannableStringBuilder(context.getString(R.string.message_list_to_fmt)).append(to); + } else { this.sender = Address.toFriendly(addrs, mContacts); diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index e296e6e76..a53a5f299 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -681,15 +681,16 @@ public class MessageList switch (keyCode) { - // messagelist is actually a K9Activity, not a K9ListActivity - // This saddens me greatly, but to support volume key navigation - // in MessageView, we implement this bit of wrapper code + // messagelist is actually a K9Activity, not a K9ListActivity + // This saddens me greatly, but to support volume key navigation + // in MessageView, we implement this bit of wrapper code case KeyEvent.KEYCODE_VOLUME_UP: { - if(K9.useVolumeKeysForNavigationEnabled()) + if (K9.useVolumeKeysForNavigationEnabled()) { - if (mListView.getSelectedItemPosition() > 0) { + if (mListView.getSelectedItemPosition() > 0) + { mListView.setSelection(mListView.getSelectedItemPosition()-1); } return true; @@ -697,9 +698,10 @@ public class MessageList } case KeyEvent.KEYCODE_VOLUME_DOWN: { - if(K9.useVolumeKeysForNavigationEnabled()) + if (K9.useVolumeKeysForNavigationEnabled()) { - if (mListView.getSelectedItemPosition() < mListView.getCount()) { + if (mListView.getSelectedItemPosition() < mListView.getCount()) + { mListView.setSelection(mListView.getSelectedItemPosition()+1); } return true; @@ -836,8 +838,10 @@ public class MessageList public boolean onKeyUp(int keyCode, KeyEvent event) { // Swallow these events too to avoid the audible notification of a volume change - if(K9.useVolumeKeysForNavigationEnabled()) { - if((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) { + if (K9.useVolumeKeysForNavigationEnabled()) + { + if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) + { if (K9.DEBUG) Log.v(K9.LOG_TAG, "Swallowed key up."); return true; @@ -2060,83 +2064,83 @@ public class MessageList { public void run() { - boolean needsSort = false; - final List messagesToAdd = new ArrayList(); - List messagesToRemove = new ArrayList(); - List messagesToSearch = new ArrayList(); + boolean needsSort = false; + final List messagesToAdd = new ArrayList(); + List messagesToRemove = new ArrayList(); + List messagesToSearch = new ArrayList(); - for (Message message : messages) - { - MessageInfoHolder m = getMessage(message); - if (message.isSet(Flag.DELETED)) - { - if (m != null) + for (Message message : messages) { - messagesToRemove.add(m); - } - } - else if (m == null) - { - if (updateForMe(account, folder)) - { - m = new MessageInfoHolder(context, message); - messagesToAdd.add(m); - } - else - { - if (mQueryString != null) + MessageInfoHolder m = getMessage(message); + if (message.isSet(Flag.DELETED)) { - if (verifyAgainstSearch) + if (m != null) { - messagesToSearch.add(message); + messagesToRemove.add(m); } - else + } + else if (m == null) + { + if (updateForMe(account, folder)) { m = new MessageInfoHolder(context, message); messagesToAdd.add(m); } + else + { + if (mQueryString != null) + { + if (verifyAgainstSearch) + { + messagesToSearch.add(message); + } + else + { + m = new MessageInfoHolder(context, message); + messagesToAdd.add(m); + } + } + } + } + else + { + m.populate(context, message, new FolderInfoHolder(context, message.getFolder(), account), account); + needsSort = true; } } - } - else - { - m.populate(context, message, new FolderInfoHolder(context, message.getFolder(), account), account); - needsSort = true; - } - } - if (messagesToSearch.size() > 0) - { - mController.searchLocalMessages(mAccountUuids, mFolderNames, messagesToSearch.toArray(EMPTY_MESSAGE_ARRAY), mQueryString, mIntegrate, mQueryFlags, mForbiddenFlags, - new MessagingListener() - { - @Override - public void listLocalMessagesAddMessages(Account account, String folder, List messages) + if (messagesToSearch.size() > 0) { - addOrUpdateMessages(account, folder, messages, false); + mController.searchLocalMessages(mAccountUuids, mFolderNames, messagesToSearch.toArray(EMPTY_MESSAGE_ARRAY), mQueryString, mIntegrate, mQueryFlags, mForbiddenFlags, + new MessagingListener() + { + @Override + public void listLocalMessagesAddMessages(Account account, String folder, List messages) + { + addOrUpdateMessages(account, folder, messages, false); + } + }); } - }); - } - if (messagesToRemove.size() > 0) - { - removeMessages(messagesToRemove); - } + if (messagesToRemove.size() > 0) + { + removeMessages(messagesToRemove); + } - if (messagesToAdd.size() > 0) - { - mHandler.addMessages(messagesToAdd); - } + if (messagesToAdd.size() > 0) + { + mHandler.addMessages(messagesToAdd); + } - if (needsSort) - { - mHandler.sortMessages(); - mHandler.resetUnreadCount(); + if (needsSort) + { + mHandler.sortMessages(); + mHandler.resetUnreadCount(); + } + } } - } - } - ); - + ); + } public MessageInfoHolder getMessage(Message message) { @@ -2434,15 +2438,15 @@ public class MessageList // Create our span sections, and assign a format to each. str.setSpan(new StyleSpan(Typeface.BOLD), - 0, - message.sender.length(), - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE - ); + 0, + message.sender.length(), + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + ); str.setSpan(new ForegroundColorSpan(Color.rgb(128,128,128)), // TODO: How do I can specify the android.R.attr.textColorTertiary - message.sender.length(), - str.length(), - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE - ); + message.sender.length(), + str.length(), + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + ); } else { diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index cf835aa31..f1c3c98f9 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -217,7 +217,7 @@ public class MessageView extends K9Activity implements OnClickListener { case KeyEvent.KEYCODE_VOLUME_UP: { - if(K9.useVolumeKeysForNavigationEnabled()) + if (K9.useVolumeKeysForNavigationEnabled()) { onNext(true); return true; @@ -225,7 +225,7 @@ public class MessageView extends K9Activity implements OnClickListener } case KeyEvent.KEYCODE_VOLUME_DOWN: { - if(K9.useVolumeKeysForNavigationEnabled()) + if (K9.useVolumeKeysForNavigationEnabled()) { onPrevious(true); return true; @@ -356,8 +356,10 @@ public class MessageView extends K9Activity implements OnClickListener public boolean onKeyUp(int keyCode, KeyEvent event) { // Swallow these events too to avoid the audible notification of a volume change - if(K9.useVolumeKeysForNavigationEnabled()) { - if((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) { + if (K9.useVolumeKeysForNavigationEnabled()) + { + if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) + { if (K9.DEBUG) Log.v(K9.LOG_TAG, "Swallowed key up."); return true; diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java index 2011bf95f..4df1917fc 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java @@ -271,7 +271,7 @@ public class AccountSetupBasics extends K9Activity * manual setup. */ onManualSetup(); - } + } } private void onNext() diff --git a/src/com/fsck/k9/helper/ContactsSdk3_4.java b/src/com/fsck/k9/helper/ContactsSdk3_4.java index 0ff17f531..f512e067d 100644 --- a/src/com/fsck/k9/helper/ContactsSdk3_4.java +++ b/src/com/fsck/k9/helper/ContactsSdk3_4.java @@ -190,11 +190,11 @@ public class ContactsSdk3_4 extends com.fsck.k9.helper.Contacts } final Cursor c = mContentResolver.query( - Contacts.ContactMethods.CONTENT_EMAIL_URI, - PROJECTION, - where, - args, - SORT_ORDER); + Contacts.ContactMethods.CONTENT_EMAIL_URI, + PROJECTION, + where, + args, + SORT_ORDER); if (c != null) { diff --git a/src/com/fsck/k9/helper/ContactsSdk5.java b/src/com/fsck/k9/helper/ContactsSdk5.java index e921391d3..2388dd734 100644 --- a/src/com/fsck/k9/helper/ContactsSdk5.java +++ b/src/com/fsck/k9/helper/ContactsSdk5.java @@ -155,11 +155,11 @@ public class ContactsSdk5 extends com.fsck.k9.helper.Contacts final String filter = (address == null) ? "" : address; final Uri uri = Uri.withAppendedPath(Email.CONTENT_FILTER_URI, Uri.encode(filter)); final Cursor c = mContentResolver.query( - uri, - PROJECTION, - null, - null, - SORT_ORDER); + uri, + PROJECTION, + null, + null, + SORT_ORDER); if (c != null) { diff --git a/src/com/fsck/k9/mail/Address.java b/src/com/fsck/k9/mail/Address.java index 838cc3632..3ca100142 100644 --- a/src/com/fsck/k9/mail/Address.java +++ b/src/com/fsck/k9/mail/Address.java @@ -248,26 +248,34 @@ public class Address public CharSequence toFriendly(Contacts contacts) { - if (contacts != null) { + if (contacts != null) + { String name = sContactsName.get(mAddress); - if (name != null && name != NO_ENTRY) { + if (name != null && name != NO_ENTRY) + { return Html.fromHtml("" + name + ""); // TODO: use setSpan } - if (name == null) { + if (name == null) + { Cursor cursor = contacts.searchByAddress(mAddress); - if (cursor != null) { - try { - if (cursor.getCount() > 0) { + if (cursor != null) + { + try + { + if (cursor.getCount() > 0) + { cursor.moveToFirst(); name = contacts.getName(cursor); sContactsName.put(mAddress, name); return Html.fromHtml("" + name + ""); // TODO: use setSpan } - else { + else + { sContactsName.put(mAddress, NO_ENTRY); } } - finally { + finally + { Log.i(K9.LOG_TAG, "cursor closed"); // cursor.close(); // TODO: should close cursor. } diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java index a7cfab183..8489e0e80 100644 --- a/src/com/fsck/k9/mail/store/LocalStore.java +++ b/src/com/fsck/k9/mail/store/LocalStore.java @@ -2190,16 +2190,17 @@ public class LocalStore extends Store implements Serializable public void deleteMessagesOlderThan(long cutoff) throws MessagingException { final String where = "folder_id = ? and date < ?"; - final String[] params = new String[] { - Long.toString(mFolderId), Long.toString(cutoff) + final String[] params = new String[] + { + Long.toString(mFolderId), Long.toString(cutoff) }; open(OpenMode.READ_ONLY); Message[] messages = LocalStore.this.getMessages( - null, - this, - "SELECT " + GET_MESSAGES_COLS + "FROM messages WHERE " + where, - params); + null, + this, + "SELECT " + GET_MESSAGES_COLS + "FROM messages WHERE " + where, + params); for (Message message : messages) {