moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-25 00:58:50 -05:00
Code Issues Releases Wiki Activity

astyle

Browse Source
This commit is contained in:
Jesse Vincent 2010-07-13 21:16:56 +00:00
parent a85c83f696
commit 70a1eef943
3 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/fsck/k9/activity/MessageList.java
View File

@ -2061,7 +2061,7 @@ public class MessageList
* 2010-06-21 - cketti
* Added null pointer check. Not sure what's causing 'holder'
* to be null. See log provided in issue 1749, comment #15.
*
*
* Please remove this comment once the cause was found and the
* bug(?) fixed.
*/
@ -2197,7 +2197,7 @@ public class MessageList
holder.preview = (TextView) view.findViewById(R.id.preview);
holder.selected = (CheckBox) view.findViewById(R.id.selected_checkbox);
holder.flagged = (CheckBox) view.findViewById(R.id.flagged);
// TODO: Don't create an instance of OnClickListener for every message
holder.flagged.setOnClickListener(new OnClickListener()
{
@ -2268,20 +2268,20 @@ public class MessageList
* from.
*/
holder.preview.setText(message.sender + " " + message.preview,
TextView.BufferType.SPANNABLE);
TextView.BufferType.SPANNABLE);
Spannable str = (Spannable)holder.preview.getText();
// Create our span sections, and assign a format to each.
str.setSpan(
new TextAppearanceSpan(
null,
Typeface.BOLD,
-1,
holder.subject.getTextColors(),
holder.subject.getLinkTextColors()),
0,
message.sender.length(),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
new TextAppearanceSpan(
null,
Typeface.BOLD,
-1,
holder.subject.getTextColors(),
holder.subject.getLinkTextColors()),
0,
message.sender.length(),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
);
}
else
@ -2984,7 +2984,7 @@ public class MessageList
if (mController.isMoveCapable(message) == false)
{
Toast toast = Toast.makeText(this,
R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
toast.show();
return;
}
@ -3019,7 +3019,7 @@ public class MessageList
if (mController.isMoveCapable(message) == false)
{
Toast toast = Toast.makeText(this,
R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
toast.show();
return;
}
@ -3116,7 +3116,7 @@ public class MessageList
if (mController.isCopyCapable(message) == false)
{
Toast toast = Toast.makeText(this,
R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
toast.show();
return;
}
@ -3150,7 +3150,7 @@ public class MessageList
if (mController.isCopyCapable(message) == false)
{
Toast toast = Toast.makeText(this,
R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
toast.show();
return;
}

18
src/com/fsck/k9/mail/internet/MimeBodyPart.java
View File

@ -126,14 +126,16 @@ public class MimeBodyPart extends BodyPart
}
else
{
int first = contentId.indexOf('<');
int last = contentId.lastIndexOf('>');
if (first != -1 && last != -1) {
return contentId.substring(first+1, last);
}
else {
return contentId;
}
int first = contentId.indexOf('<');
int last = contentId.lastIndexOf('>');
if (first != -1 && last != -1)
{
return contentId.substring(first+1, last);
}
else
{
return contentId;
}
}
}

11
src/com/fsck/k9/mail/store/LocalStore.java
View File

@ -2068,7 +2068,8 @@ public class LocalStore extends Store implements Serializable
{
Cursor cursor = null;
cursor = mDb.query("messages", new String[] { "html_content" }, "id = ?", new String[] { Long.toString(messageId) }, null, null, null);
try {
try
{
if (cursor.moveToNext())
{
String new_html;
@ -2081,8 +2082,12 @@ public class LocalStore extends Store implements Serializable
mDb.update("messages", cv, "id = ?", new String[] { Long.toString(messageId) });
}
}
finally {
if (cursor != null) { cursor.close(); }
finally
{
if (cursor != null)
{
cursor.close();
}
}
}