From 91fa034d624d8690905f30a13ae3ffb9601cf948 Mon Sep 17 00:00:00 2001 From: Paul Westbrook Date: Tue, 19 Aug 2014 03:25:17 -0700 Subject: Pass Account object to attachment view intent builder Pass the full account object to the inline attachment view intent builder Bug: 16153528 Change-Id: I9c7d24d9b1d32f141190398cdee93a235a09d1f8 --- .../android/mail/browse/InlineAttachmentViewIntentBuilderCreator.java | 3 ++- src/com/android/mail/ui/ConversationViewFragment.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/mail/browse/InlineAttachmentViewIntentBuilderCreator.java b/src/com/android/mail/browse/InlineAttachmentViewIntentBuilderCreator.java index 551306894..85062ce25 100644 --- a/src/com/android/mail/browse/InlineAttachmentViewIntentBuilderCreator.java +++ b/src/com/android/mail/browse/InlineAttachmentViewIntentBuilderCreator.java @@ -17,6 +17,7 @@ package com.android.mail.browse; +import com.android.mail.providers.Account; /** * Creates {@link InlineAttachmentViewIntentBuilder}s. Only one @@ -25,5 +26,5 @@ package com.android.mail.browse; */ public interface InlineAttachmentViewIntentBuilderCreator { InlineAttachmentViewIntentBuilder createInlineAttachmentViewIntentBuilder( - String account, long conversationId); + Account account, long conversationId); } diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java index b2661e0e0..d3c7600aa 100644 --- a/src/com/android/mail/ui/ConversationViewFragment.java +++ b/src/com/android/mail/ui/ConversationViewFragment.java @@ -313,7 +313,7 @@ public class ConversationViewFragment extends AbstractConversationViewFragment i InlineAttachmentViewIntentBuilderCreatorHolder. getInlineAttachmentViewIntentCreator(); final WebViewContextMenu contextMenu = new WebViewContextMenu(getActivity(), - creator.createInlineAttachmentViewIntentBuilder(mAccount.getEmailAddress(), + creator.createInlineAttachmentViewIntentBuilder(mAccount, mConversation != null ? mConversation.id : -1)); contextMenu.setCallbacks(this); mWebView.setOnCreateContextMenuListener(contextMenu); -- cgit v1.2.3