This commit is contained in:
Jesse Vincent 2010-08-02 01:27:40 +00:00
parent a4381696f9
commit 7fc921c0b7
5 changed files with 43 additions and 39 deletions

View file

@ -4541,7 +4541,7 @@ public class MessagingController implements Runnable
{ {
// Do not notify if the user does not have notifications // Do not notify if the user does not have notifications
// enabled or if the message has been read // enabled or if the message has been read
if (!account.isNotifyNewMail() || message.isSet(Flag.SEEN) || ( account.getName() == null) ) if (!account.isNotifyNewMail() || message.isSet(Flag.SEEN) || (account.getName() == null))
{ {
return false; return false;
} }

View file

@ -355,7 +355,8 @@ public class Apg extends CryptoProvider
mEncryptedData = data.getStringExtra(Apg.EXTRA_ENCRYPTED_MESSAGE); mEncryptedData = data.getStringExtra(Apg.EXTRA_ENCRYPTED_MESSAGE);
// this was a stupid bug in an earlier version, just gonna leave this in for an APG // this was a stupid bug in an earlier version, just gonna leave this in for an APG
// version or two // version or two
if (mEncryptedData == null) { if (mEncryptedData == null)
{
mEncryptedData = data.getStringExtra(Apg.EXTRA_DECRYPTED_MESSAGE); mEncryptedData = data.getStringExtra(Apg.EXTRA_DECRYPTED_MESSAGE);
} }
if (mEncryptedData != null) if (mEncryptedData != null)
@ -450,7 +451,8 @@ public class Apg extends CryptoProvider
public boolean isEncrypted(Message message) public boolean isEncrypted(Message message)
{ {
String data = null; String data = null;
try { try
{
Part part = MimeUtility.findFirstPartByMimeType(message, "text/plain"); Part part = MimeUtility.findFirstPartByMimeType(message, "text/plain");
if (part == null) if (part == null)
{ {
@ -479,7 +481,8 @@ public class Apg extends CryptoProvider
public boolean isSigned(Message message) public boolean isSigned(Message message)
{ {
String data = null; String data = null;
try { try
{
Part part = MimeUtility.findFirstPartByMimeType(message, "text/plain"); Part part = MimeUtility.findFirstPartByMimeType(message, "text/plain");
if (part == null) if (part == null)
{ {

View file

@ -523,7 +523,8 @@ public class MimeUtility
* If the part is HTML and it got this far it's part of a mixed (et * If the part is HTML and it got this far it's part of a mixed (et
* al) and should be rendered inline. * al) and should be rendered inline.
*/ */
else if (isPartTextualBody(part)) { else if (isPartTextualBody(part))
{
viewables.add(part); viewables.add(part);
} }
else else
@ -534,7 +535,7 @@ public class MimeUtility
} }
public static Boolean isPartTextualBody (Part part) throws MessagingException public static Boolean isPartTextualBody(Part part) throws MessagingException
{ {
String disposition = part.getDisposition(); String disposition = part.getDisposition();
String dispositionType = null; String dispositionType = null;