diff options
| author | Paul Westbrook <pwestbro@google.com> | 2014-08-13 11:29:17 -0700 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2014-08-13 12:49:28 -0700 |
| commit | ce29380a68ee4bf6d5d8cf11d9eda7caa6482de4 (patch) | |
| tree | 42c0d6e5983a5bc0478e6a57c53dda6dee9d5ad1 /src | |
| parent | 0c98950b8d92b4284810501fed95937f02a32290 (diff) | |
| download | android_packages_apps_UnifiedEmail-ce29380a68ee4bf6d5d8cf11d9eda7caa6482de4.tar.gz android_packages_apps_UnifiedEmail-ce29380a68ee4bf6d5d8cf11d9eda7caa6482de4.tar.bz2 android_packages_apps_UnifiedEmail-ce29380a68ee4bf6d5d8cf11d9eda7caa6482de4.zip | |
prevent NPE
Bug: 16949922
Change-Id: Ic542ddf5b6946816f0e7be562a4b0238abf6bb7d
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/browse/ConversationViewHeader.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/mail/browse/ConversationViewHeader.java b/src/com/android/mail/browse/ConversationViewHeader.java index 1a8f5c614..68a160426 100644 --- a/src/com/android/mail/browse/ConversationViewHeader.java +++ b/src/com/android/mail/browse/ConversationViewHeader.java @@ -104,6 +104,7 @@ public class ConversationViewHeader extends LinearLayout implements OnClickListe public void setStarred(boolean isStarred) { mStarView.setStarred(isStarred); + mStarView.setVisibility(View.VISIBLE); } public void bind(ConversationHeaderItem headerItem) { @@ -112,6 +113,7 @@ public class ConversationViewHeader extends LinearLayout implements OnClickListe if (mSubjectAndFolderView != null) { mSubjectAndFolderView.bind(headerItem); } + mStarView.setVisibility(mConversation != null ? View.VISIBLE : View.INVISIBLE); } private int measureHeight() { @@ -146,7 +148,7 @@ public class ConversationViewHeader extends LinearLayout implements OnClickListe @Override public void onClick(View v) { final int id = v.getId(); - if (id == R.id.conversation_header_star) { + if (mConversation != null && id == R.id.conversation_header_star) { mConversation.starred = !mConversation.starred; setStarred(mConversation.starred); mConversationUpdater.updateConversation(Conversation.listOf(mConversation), |