diff --git a/src/com/fsck/k9/activity/ActivityListener.java b/src/com/fsck/k9/activity/ActivityListener.java index 432e87da2..6fbfaec16 100644 --- a/src/com/fsck/k9/activity/ActivityListener.java +++ b/src/com/fsck/k9/activity/ActivityListener.java @@ -37,8 +37,7 @@ public class ActivityListener extends MessagingListener { String displayName = mLoadingFolderName; if (K9.INBOX.equalsIgnoreCase(displayName)) { displayName = context.getString(R.string.special_mailbox_name_inbox); - } - else if ((mAccount != null) && mAccount.getOutboxFolderName().equals(displayName)) { + } else if ((mAccount != null) && mAccount.getOutboxFolderName().equals(displayName)) { displayName = context.getString(R.string.special_mailbox_name_outbox); } diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java index d64d09530..8f3e447e7 100644 --- a/src/com/fsck/k9/activity/FolderList.java +++ b/src/com/fsck/k9/activity/FolderList.java @@ -313,7 +313,7 @@ public class FolderList extends K9ListActivity { if (previousData != null) { mAdapter.mFolders = (ArrayList) previousData; - mAdapter.mFilteredFolders = Collections.unmodifiableList(mAdapter.mFolders); + mAdapter.mFilteredFolders = Collections.unmodifiableList(mAdapter.mFolders); } } @@ -1029,7 +1029,7 @@ public class FolderList extends K9ListActivity { return getItemView(position, convertView, parent); } else { Log.e(K9.LOG_TAG, "getView with illegal positon=" + position - + " called! count is only " + getCount()); + + " called! count is only " + getCount()); return null; } } @@ -1136,77 +1136,77 @@ public class FolderList extends K9ListActivity { return true; } - public void setFilter(final Filter filter) { - this.mFilter = filter; - } + public void setFilter(final Filter filter) { + this.mFilter = filter; + } - public Filter getFilter() { - return mFilter; - } + public Filter getFilter() { + return mFilter; + } - /** - * Filter to search for occurences of the search-expression in any place of the - * folder-name instead of doing jsut a prefix-search. - * - * @author Marcus@Wolschon.biz - */ - public class FolderListFilter extends Filter { + /** + * Filter to search for occurences of the search-expression in any place of the + * folder-name instead of doing jsut a prefix-search. + * + * @author Marcus@Wolschon.biz + */ + public class FolderListFilter extends Filter { - /** - * Do the actual search. - * {@inheritDoc} - * - * @see #publishResults(CharSequence, FilterResults) - */ - @Override - protected FilterResults performFiltering(CharSequence searchTerm) { - FilterResults results = new FilterResults(); + /** + * Do the actual search. + * {@inheritDoc} + * + * @see #publishResults(CharSequence, FilterResults) + */ + @Override + protected FilterResults performFiltering(CharSequence searchTerm) { + FilterResults results = new FilterResults(); - if ((searchTerm == null) || (searchTerm.length() == 0)) { - ArrayList list = new ArrayList(mFolders); - results.values = list; - results.count = list.size(); - } else { - final String searchTermString = searchTerm.toString().toLowerCase(); - final String[] words = searchTermString.split(" "); - final int wordCount = words.length; + if ((searchTerm == null) || (searchTerm.length() == 0)) { + ArrayList list = new ArrayList(mFolders); + results.values = list; + results.count = list.size(); + } else { + final String searchTermString = searchTerm.toString().toLowerCase(); + final String[] words = searchTermString.split(" "); + final int wordCount = words.length; - final ArrayList newValues = new ArrayList(); + final ArrayList newValues = new ArrayList(); - for (final FolderInfoHolder value : mFolders) { - if (value.displayName == null) { - continue; - } - final String valueText = value.displayName.toLowerCase(); + for (final FolderInfoHolder value : mFolders) { + if (value.displayName == null) { + continue; + } + final String valueText = value.displayName.toLowerCase(); - for (int k = 0; k < wordCount; k++) { - if (valueText.contains(words[k])) { - newValues.add(value); - break; - } - } - } + for (int k = 0; k < wordCount; k++) { + if (valueText.contains(words[k])) { + newValues.add(value); + break; + } + } + } - results.values = newValues; - results.count = newValues.size(); - } + results.values = newValues; + results.count = newValues.size(); + } - return results; - } + return results; + } - /** - * Publish the results to the user-interface. - * {@inheritDoc} - */ - @SuppressWarnings("unchecked") - @Override - protected void publishResults(CharSequence constraint, FilterResults results) { - //noinspection unchecked - mFilteredFolders = Collections.unmodifiableList((ArrayList) results.values); - // Send notification that the data set changed now - notifyDataSetChanged(); - } - } + /** + * Publish the results to the user-interface. + * {@inheritDoc} + */ + @SuppressWarnings("unchecked") + @Override + protected void publishResults(CharSequence constraint, FilterResults results) { + //noinspection unchecked + mFilteredFolders = Collections.unmodifiableList((ArrayList) results.values); + // Send notification that the data set changed now + notifyDataSetChanged(); + } + } } static class FolderViewHolder { diff --git a/src/com/fsck/k9/activity/FolderListFilter.java b/src/com/fsck/k9/activity/FolderListFilter.java index 172c2f33d..7ed58a77a 100644 --- a/src/com/fsck/k9/activity/FolderListFilter.java +++ b/src/com/fsck/k9/activity/FolderListFilter.java @@ -101,24 +101,24 @@ public class FolderListFilter extends Filter { mFolders.setNotifyOnChange(false); try { - //noinspection unchecked - final List folders = (List) results.values; - mFolders.clear(); - if (folders != null) { - for (T folder : folders) { - if (folder != null) { - mFolders.add(folder); - } - } - } else { - Log.w(K9.LOG_TAG, "FolderListFilter.publishResults - null search-result "); - } + //noinspection unchecked + final List folders = (List) results.values; + mFolders.clear(); + if (folders != null) { + for (T folder : folders) { + if (folder != null) { + mFolders.add(folder); + } + } + } else { + Log.w(K9.LOG_TAG, "FolderListFilter.publishResults - null search-result "); + } - // Send notification that the data set changed now - mFolders.notifyDataSetChanged(); + // Send notification that the data set changed now + mFolders.notifyDataSetChanged(); } finally { - // restore notification status - mFolders.setNotifyOnChange(true); + // restore notification status + mFolders.setNotifyOnChange(true); } } diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index d717cc0cf..28593c0fc 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -547,10 +547,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc if (!ACTION_EDIT_DRAFT.equals(action)) { String bccAddress = mAccount.getAlwaysBcc(); if ((bccAddress != null) && !("".equals(bccAddress))) { - String[] bccAddresses = bccAddress.split(","); - for (String oneBccAddress : bccAddresses) { - addAddress(mBccView, new Address(oneBccAddress, "")); - } + String[] bccAddresses = bccAddress.split(","); + for (String oneBccAddress : bccAddresses) { + addAddress(mBccView, new Address(oneBccAddress, "")); + } } } diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index ae63d9a17..b937a66ab 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -943,13 +943,13 @@ public class MessageView extends K9Activity implements OnClickListener { @Override protected Dialog onCreateDialog(final int id) { switch (id) { - case R.id.dialog_confirm_delete: - return createConfirmDeleteDialog(id); - case R.id.dialog_attachment_progress: - ProgressDialog d = new ProgressDialog(this); - d.setIndeterminate(true); - d.setTitle(R.string.dialog_attachment_progress_title); - return d; + case R.id.dialog_confirm_delete: + return createConfirmDeleteDialog(id); + case R.id.dialog_attachment_progress: + ProgressDialog d = new ProgressDialog(this); + d.setIndeterminate(true); + d.setTitle(R.string.dialog_attachment_progress_title); + return d; } return super.onCreateDialog(id); } diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java index ff7c1c5f3..d0ff1f9ff 100644 --- a/src/com/fsck/k9/activity/setup/AccountSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSettings.java @@ -853,12 +853,10 @@ public class AccountSettings extends K9PreferenceActivity { // TODO: In the future the call above should be changed to only return remote folders. // For now we just remove the Outbox folder if present. - Iterator iter = folders.iterator(); - while (iter.hasNext()) - { + Iterator iter = folders.iterator(); + while (iter.hasNext()) { Folder folder = iter.next(); - if (mAccount.getOutboxFolderName().equalsIgnoreCase(folder.getName())) - { + if (mAccount.getOutboxFolderName().equalsIgnoreCase(folder.getName())) { iter.remove(); } } diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java index 5a52f30b1..7acc65882 100644 --- a/src/com/fsck/k9/controller/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -3016,7 +3016,7 @@ public class MessagingController implements Runnable { Log.i(K9.LOG_TAG, "Send count for message " + message.getUid() + " is " + count.get()); if (count.incrementAndGet() > K9.MAX_SEND_ATTEMPTS) { - Log.e(K9.LOG_TAG, "Send count for message " + message.getUid() + " can't be delivered after "+ K9.MAX_SEND_ATTEMPTS + " attempts. Giving up until the user restarts the device"); + Log.e(K9.LOG_TAG, "Send count for message " + message.getUid() + " can't be delivered after " + K9.MAX_SEND_ATTEMPTS + " attempts. Giving up until the user restarts the device"); notifySendTempFailed(account, new MessagingException(message.getSubject())); continue; } diff --git a/src/com/fsck/k9/helper/HtmlConverter.java b/src/com/fsck/k9/helper/HtmlConverter.java index cc4a365f3..f4135138d 100644 --- a/src/com/fsck/k9/helper/HtmlConverter.java +++ b/src/com/fsck/k9/helper/HtmlConverter.java @@ -1074,8 +1074,8 @@ public class HtmlConverter { private static String htmlifyMessageHeader() { final String font = K9.messageViewFixedWidthFont() - ? "monospace" - : "sans-serif"; + ? "monospace" + : "sans-serif"; return "
";
     }
 
diff --git a/src/com/fsck/k9/mail/internet/EncoderUtil.java b/src/com/fsck/k9/mail/internet/EncoderUtil.java
index 8b1428f65..2665ee7e8 100644
--- a/src/com/fsck/k9/mail/internet/EncoderUtil.java
+++ b/src/com/fsck/k9/mail/internet/EncoderUtil.java
@@ -87,7 +87,7 @@ public class EncoderUtil {
         int encodedLength = bEncodedLength(bytes);
 
         int totalLength = prefix.length() + encodedLength
-                + ENC_WORD_SUFFIX.length();
+                          + ENC_WORD_SUFFIX.length();
         if (totalLength <= ENCODED_WORD_MAX_LENGTH) {
             return prefix + org.apache.james.mime4j.codec.EncoderUtil.encodeB(bytes) + ENC_WORD_SUFFIX;
         } else {
@@ -111,7 +111,7 @@ public class EncoderUtil {
         int encodedLength = qEncodedLength(bytes);
 
         int totalLength = prefix.length() + encodedLength
-                + ENC_WORD_SUFFIX.length();
+                          + ENC_WORD_SUFFIX.length();
         if (totalLength <= ENCODED_WORD_MAX_LENGTH) {
             return prefix + org.apache.james.mime4j.codec.EncoderUtil.encodeQ(bytes, org.apache.james.mime4j.codec.EncoderUtil.Usage.WORD_ENTITY) + ENC_WORD_SUFFIX;
         } else {
diff --git a/src/com/fsck/k9/mail/internet/MimeHeader.java b/src/com/fsck/k9/mail/internet/MimeHeader.java
index 0b205527f..c6b8510c8 100644
--- a/src/com/fsck/k9/mail/internet/MimeHeader.java
+++ b/src/com/fsck/k9/mail/internet/MimeHeader.java
@@ -147,8 +147,7 @@ public class MimeHeader {
         }
     }
 
-    public void setCharset(String charset)
-    {
+    public void setCharset(String charset) {
         mCharset = charset;
     }
 }