moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-08-13 17:03:48 -04:00
Code Issues Releases Wiki Activity

astyle

Browse Source
This commit is contained in:
Jesse Vincent 2011-01-14 01:37:52 +00:00
parent 8bb7613471
commit aacb414004
6 changed files with 65 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,8 @@ class InsertableHtmlContent implements Serializable
/**
* Remove all quoted content.
*/
public void clearQuotedContent() {
public void clearQuotedContent()
{
quotedContent.setLength(0);
footerInsertionPoint = 0;
headerInsertionPoint = 0;
@ -89,7 +90,8 @@ class InsertableHtmlContent implements Serializable
* inserted content buffer.
* @param content
*/
public void setUserContent(final String content) {
public void setUserContent(final String content)
{
userContent = new StringBuilder(content);
}

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

@ -1193,7 +1193,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
// FYI, there's nothing in the code that requires these variables to one letter. They're one
// letter simply to save space. This name sucks. It's too similar to Account.Identity.
private enum IdentityField {
private enum IdentityField
{
LENGTH("l"),
OFFSET("o"),
MESSAGE_FORMAT("f"),
@ -1205,11 +1206,13 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
private final String value;
IdentityField(String value) {
IdentityField(String value)
{
this.value = value;
}
public String value() {
public String value()
{
return value;
}
@ -1218,7 +1221,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
* checked for integer-ness during decoding.
* @return
*/
public static IdentityField[] getIntegerFields() {
public static IdentityField[] getIntegerFields()
{
return new IdentityField[] { LENGTH, OFFSET };
}
}
@ -1232,13 +1236,17 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
* @param body {@link TextBody} to analyze for body length and offset.
* @return Identity string.
*/
private String buildIdentityHeader(final TextBody body) {
private String buildIdentityHeader(final TextBody body)
{
Uri.Builder uri = new Uri.Builder();
if(body.getComposedMessageLength() != null && body.getComposedMessageOffset() != null) {
if(body.getComposedMessageLength() != null && body.getComposedMessageOffset() != null)
{
// See if the message body length is already in the TextBody.
uri.appendQueryParameter(IdentityField.LENGTH.value(), body.getComposedMessageLength().toString());
uri.appendQueryParameter(IdentityField.OFFSET.value(), body.getComposedMessageOffset().toString());
} else {
}
else
{
// If not, calculate it now.
uri.appendQueryParameter(IdentityField.LENGTH.value(), Integer.toString(body.getText().length()));
uri.appendQueryParameter(IdentityField.OFFSET.value(), Integer.toString(0));
@ -1312,7 +1320,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
try
{
Integer.parseInt(identity.get(key));
} catch (NumberFormatException e)
}
catch (NumberFormatException e)
{
Log.e(K9.LOG_TAG, "Invalid " + key.name() + " field in identity: " + identity.get(key));
}
@ -1334,7 +1343,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
try
{
identity.put(IdentityField.LENGTH, Integer.valueOf(bodyLengthS).toString());
} catch (Exception e)
}
catch (Exception e)
{
Log.e(K9.LOG_TAG, "Unable to parse bodyLength '" + bodyLengthS + "'");
}
@ -2253,7 +2263,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
// composition window. If that's the case, try and convert it to text to
// match the behavior in text mode.
mMessageContentView.setText(getBodyTextFromMessage(message, MessageFormat.TEXT));
} else {
}
else
{
Part part = MimeUtility.findFirstPartByMimeType(message, "text/html");
if (part != null) // Shouldn't happen if we were the one who saved it.
{