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

Add reference to root part to MessageViewContainer

Browse Source
This commit is contained in:
cketti 2015-02-06 20:03:33 +01:00
parent 49c4115e46
commit cadac6dd89
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -450,15 +450,15 @@ public class LocalMessageExtractor {
MessageViewContainer messageViewContainer; MessageViewContainer messageViewContainer;
if (pgpAnnotation == NO_ANNOTATIONS) { if (pgpAnnotation == NO_ANNOTATIONS) {
messageViewContainer = new MessageViewContainer(viewable.html, attachmentInfos); messageViewContainer = new MessageViewContainer(viewable.html, part, attachmentInfos);
} else { } 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();
messageViewContainer = new MessageViewContainer(viewable.html, attachmentInfos, pgpResult, pgpError, messageViewContainer = new MessageViewContainer(viewable.html, part, attachmentInfos, pgpResult,
wasEncrypted, pendingIntent); pgpError, wasEncrypted, pendingIntent);
} }
containers.add(messageViewContainer); containers.add(messageViewContainer);

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

@ -6,6 +6,7 @@ import java.util.List;
import android.app.PendingIntent; import android.app.PendingIntent;
import com.fsck.k9.mail.Message; import com.fsck.k9.mail.Message;
import com.fsck.k9.mail.Part;
import org.openintents.openpgp.OpenPgpError; import org.openintents.openpgp.OpenPgpError;
import org.openintents.openpgp.OpenPgpSignatureResult; import org.openintents.openpgp.OpenPgpSignatureResult;
@ -23,19 +24,22 @@ public class MessageViewInfo {
public static class MessageViewContainer { public static class MessageViewContainer {
public final String text; public final String text;
public final Part rootPart;
public final List<AttachmentViewInfo> attachments; public final List<AttachmentViewInfo> attachments;
public final boolean encrypted; public final boolean encrypted;
public final OpenPgpSignatureResult signatureResult; public final OpenPgpSignatureResult signatureResult;
public final OpenPgpError pgpError; public final OpenPgpError pgpError;
public final PendingIntent pgpPendingIntent; public final PendingIntent pgpPendingIntent;
MessageViewContainer(String text, List<AttachmentViewInfo> attachments) { MessageViewContainer(String text, Part rootPart, List<AttachmentViewInfo> attachments) {
this(text, attachments, null, null, false, null); this(text, rootPart, attachments, null, null, false, null);
} }
MessageViewContainer(String text, List<AttachmentViewInfo> attachments, OpenPgpSignatureResult signatureResult, MessageViewContainer(String text, Part rootPart, List<AttachmentViewInfo> attachments,
OpenPgpError pgpError, boolean encrypted, PendingIntent pgpPendingIntent) { OpenPgpSignatureResult signatureResult, OpenPgpError pgpError, boolean encrypted,
PendingIntent pgpPendingIntent) {
this.text = text; this.text = text;
this.rootPart = rootPart;
this.attachments = attachments; this.attachments = attachments;
this.signatureResult = signatureResult; this.signatureResult = signatureResult;
this.pgpError = pgpError; this.pgpError = pgpError;