moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Better name for method argument

This commit is contained in:
cketti 2015-02-17 01:43:39 +01:00
parent e16f8af667
commit 6b52f41e2c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
View File

@ -82,16 +82,17 @@ public class MessageContainerView extends LinearLayout implements OnClickListene
private ClipboardManager mClipboardManager; private ClipboardManager mClipboardManager;
private String mText; private String mText;
private Map<AttachmentViewInfo, AttachmentView> attachments = new HashMap<AttachmentViewInfo, AttachmentView>(); private Map<AttachmentViewInfo, AttachmentView> attachments = new HashMap<AttachmentViewInfo, AttachmentView>();
private boolean displayPgpData; private boolean displayPgpHeader;
private OpenPgpHeaderView openPgpHeaderView; private OpenPgpHeaderView openPgpHeaderView;
public void initialize(AttachmentViewCallback attachmentCallback, public void initialize(AttachmentViewCallback attachmentCallback,
OpenPgpHeaderViewCallback openPgpHeaderViewCallback, boolean displayPgpData) { OpenPgpHeaderViewCallback openPgpHeaderViewCallback, boolean displayPgpHeader) {
Context context = getContext(); Context context = getContext();
this.attachmentCallback = attachmentCallback; this.attachmentCallback = attachmentCallback;
this.openPgpHeaderViewCallback = openPgpHeaderViewCallback; this.openPgpHeaderViewCallback = openPgpHeaderViewCallback;
this.displayPgpHeader = displayPgpHeader;
mOpenPgpHeaderStub = (ViewStub) findViewById(R.id.openpgp_header_stub); mOpenPgpHeaderStub = (ViewStub) findViewById(R.id.openpgp_header_stub);
mSidebar = findViewById(R.id.message_sidebar); mSidebar = findViewById(R.id.message_sidebar);
@ -118,9 +119,7 @@ public class MessageContainerView extends LinearLayout implements OnClickListene
mInflater = LayoutInflater.from(context); mInflater = LayoutInflater.from(context);
mMessageContentView.setVisibility(View.VISIBLE); mMessageContentView.setVisibility(View.VISIBLE);
this.displayPgpData = displayPgpData; if (displayPgpHeader) {
if (displayPgpData) {
openPgpHeaderView = (OpenPgpHeaderView) mOpenPgpHeaderStub.inflate(); openPgpHeaderView = (OpenPgpHeaderView) mOpenPgpHeaderStub.inflate();
openPgpHeaderView.initialize(); openPgpHeaderView.initialize();
} }
@ -476,7 +475,7 @@ public class MessageContainerView extends LinearLayout implements OnClickListene
} }
*/ */
if (displayPgpData) { if (displayPgpHeader) {
openPgpHeaderView.setOpenPgpData(messageViewContainer.signatureResult, messageViewContainer.encrypted, openPgpHeaderView.setOpenPgpData(messageViewContainer.signatureResult, messageViewContainer.encrypted,
messageViewContainer.pgpPendingIntent); messageViewContainer.pgpPendingIntent);
openPgpHeaderView.setCallback(openPgpHeaderViewCallback); openPgpHeaderView.setCallback(openPgpHeaderViewCallback);

4
k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.java
View File

@ -67,8 +67,8 @@ public class MessageTopView extends LinearLayout {
for (MessageViewContainer container : messageViewInfo.containers) { for (MessageViewContainer container : messageViewInfo.containers) {
MessageContainerView view = (MessageContainerView) mInflater.inflate(R.layout.message_container, null); MessageContainerView view = (MessageContainerView) mInflater.inflate(R.layout.message_container, null);
view.initialize(attachmentCallback, openPgpHeaderViewCallback, boolean displayPgpHeader = !Account.NO_OPENPGP_PROVIDER.equals(account.getOpenPgpProvider());
!Account.NO_OPENPGP_PROVIDER.equals(account.getOpenPgpProvider())); view.initialize(attachmentCallback, openPgpHeaderViewCallback, displayPgpHeader);
view.setMessageViewContainer(container); view.setMessageViewContainer(container);
containerViews.addView(view); containerViews.addView(view);