moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 11:42:16 -05:00
Code Issues Releases Wiki Activity

Refactor code; no functional changes

Browse Source
This commit is contained in:
cketti 2015-02-06 20:01:14 +01:00
parent 3377e50352
commit 49c4115e46
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java
View File

@ -448,18 +448,20 @@ public class LocalMessageExtractor {
attachments); attachments);
List<AttachmentViewInfo> attachmentInfos = extractAttachmentInfos(context, attachments); List<AttachmentViewInfo> attachmentInfos = extractAttachmentInfos(context, attachments);
if (pgpAnnotation != NO_ANNOTATIONS) { MessageViewContainer messageViewContainer;
if (pgpAnnotation == NO_ANNOTATIONS) {
messageViewContainer = new MessageViewContainer(viewable.html, attachmentInfos);
} else {
OpenPgpSignatureResult pgpResult = pgpAnnotation.getSignatureResult(); OpenPgpSignatureResult pgpResult = pgpAnnotation.getSignatureResult();
OpenPgpError pgpError = pgpAnnotation.getError(); OpenPgpError pgpError = pgpAnnotation.getError();
boolean wasEncrypted = pgpAnnotation.wasEncrypted(); boolean wasEncrypted = pgpAnnotation.wasEncrypted();
PendingIntent pendingIntent = pgpAnnotation.getPendingIntent(); PendingIntent pendingIntent = pgpAnnotation.getPendingIntent();
containers.add(new MessageViewContainer( messageViewContainer = new MessageViewContainer(viewable.html, attachmentInfos, pgpResult, pgpError,
viewable.html, attachmentInfos, pgpResult, pgpError, wasEncrypted, pendingIntent)); wasEncrypted, pendingIntent);
} else {
containers.add(new MessageViewContainer(viewable.html, attachmentInfos));
} }
containers.add(messageViewContainer);
} }
return new MessageViewInfo(containers, message); return new MessageViewInfo(containers, message);