mirror of
https://github.com/moparisthebest/k-9
synced 2024-11-23 09:52:16 -05:00
Add reference to root part to MessageViewContainer
This commit is contained in:
parent
49c4115e46
commit
cadac6dd89
@ -450,15 +450,15 @@ public class LocalMessageExtractor {
|
||||
|
||||
MessageViewContainer messageViewContainer;
|
||||
if (pgpAnnotation == NO_ANNOTATIONS) {
|
||||
messageViewContainer = new MessageViewContainer(viewable.html, attachmentInfos);
|
||||
messageViewContainer = new MessageViewContainer(viewable.html, part, attachmentInfos);
|
||||
} else {
|
||||
OpenPgpSignatureResult pgpResult = pgpAnnotation.getSignatureResult();
|
||||
OpenPgpError pgpError = pgpAnnotation.getError();
|
||||
boolean wasEncrypted = pgpAnnotation.wasEncrypted();
|
||||
PendingIntent pendingIntent = pgpAnnotation.getPendingIntent();
|
||||
|
||||
messageViewContainer = new MessageViewContainer(viewable.html, attachmentInfos, pgpResult, pgpError,
|
||||
wasEncrypted, pendingIntent);
|
||||
messageViewContainer = new MessageViewContainer(viewable.html, part, attachmentInfos, pgpResult,
|
||||
pgpError, wasEncrypted, pendingIntent);
|
||||
}
|
||||
|
||||
containers.add(messageViewContainer);
|
||||
|
@ -6,6 +6,7 @@ import java.util.List;
|
||||
import android.app.PendingIntent;
|
||||
|
||||
import com.fsck.k9.mail.Message;
|
||||
import com.fsck.k9.mail.Part;
|
||||
import org.openintents.openpgp.OpenPgpError;
|
||||
import org.openintents.openpgp.OpenPgpSignatureResult;
|
||||
|
||||
@ -23,19 +24,22 @@ public class MessageViewInfo {
|
||||
|
||||
public static class MessageViewContainer {
|
||||
public final String text;
|
||||
public final Part rootPart;
|
||||
public final List<AttachmentViewInfo> attachments;
|
||||
public final boolean encrypted;
|
||||
public final OpenPgpSignatureResult signatureResult;
|
||||
public final OpenPgpError pgpError;
|
||||
public final PendingIntent pgpPendingIntent;
|
||||
|
||||
MessageViewContainer(String text, List<AttachmentViewInfo> attachments) {
|
||||
this(text, attachments, null, null, false, null);
|
||||
MessageViewContainer(String text, Part rootPart, List<AttachmentViewInfo> attachments) {
|
||||
this(text, rootPart, attachments, null, null, false, null);
|
||||
}
|
||||
|
||||
MessageViewContainer(String text, List<AttachmentViewInfo> attachments, OpenPgpSignatureResult signatureResult,
|
||||
OpenPgpError pgpError, boolean encrypted, PendingIntent pgpPendingIntent) {
|
||||
MessageViewContainer(String text, Part rootPart, List<AttachmentViewInfo> attachments,
|
||||
OpenPgpSignatureResult signatureResult, OpenPgpError pgpError, boolean encrypted,
|
||||
PendingIntent pgpPendingIntent) {
|
||||
this.text = text;
|
||||
this.rootPart = rootPart;
|
||||
this.attachments = attachments;
|
||||
this.signatureResult = signatureResult;
|
||||
this.pgpError = pgpError;
|
||||
|
Loading…
Reference in New Issue
Block a user