commit f55d4c8f31c0dafd0b16cba94e2ecd29d003864c
author Tony Mantler <nicoya@google.com> Thu Jan 30 15:59:21 2014 -0800
committer Tony Mantler <nicoya@google.com> Thu Jan 30 16:16:49 2014 -0800
tree 45a7452173b1fec434298af5f32e8c345e1f9892
parent 672dce638fdaafbde8ae909ba2a9558921c8b11c

Null check adapter before grabbing bidi formatter

b/12807578

Change-Id: I0c3d9b4cfc312f517fb2da10cc5220139d69052f

src/com/android/mail/browse/MessageHeaderView.java

diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 373d492..d82f960 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -16,6 +16,7 @@
 
 package com.android.mail.browse;
 
+import android.annotation.SuppressLint;
 import android.app.FragmentManager;
 import android.content.AsyncQueryHandler;
 import android.content.Context;
@@ -208,6 +209,8 @@
      */
     private boolean mIsSnappy;
 
+    private BidiFormatter mBidiFormatter;
+
 
     public interface MessageHeaderViewCallbacks {
         void setMessageSpacerHeight(MessageHeaderItem item, int newSpacerHeight);
@@ -388,6 +391,18 @@
         render(false);
     }
 
+    private BidiFormatter getBidiFormatter() {
+        if (mBidiFormatter == null) {
+            final ConversationViewAdapter adapter = mMessageHeaderItem != null ? mMessageHeaderItem.getAdapter() : null;
+            if (adapter == null) {
+                mBidiFormatter = BidiFormatter.getInstance();
+            } else {
+                mBidiFormatter = adapter.getBidiFormatter();
+            }
+        }
+        return mBidiFormatter;
+    }
+
     private void render(boolean measureOnly) {
         if (mMessageHeaderItem == null) {
             return;
@@ -452,7 +467,7 @@
 
         updateChildVisibility();
 
-        final BidiFormatter bidiFormatter = mMessageHeaderItem.getAdapter().getBidiFormatter();
+        final BidiFormatter bidiFormatter = getBidiFormatter();
         if (mIsDraft || mIsSending) {
             mSnippet = bidiFormatter.unicodeWrap(makeSnippet(mMessage.snippet));
         } else {
@@ -531,7 +546,7 @@
         } else if (mIsSending) {
             title = getResources().getString(R.string.sending);
         } else {
-            title = mMessageHeaderItem.getAdapter().getBidiFormatter().unicodeWrap(
+            title = getBidiFormatter().unicodeWrap(
                     getSenderName(mSender));
         }
 
@@ -686,6 +701,7 @@
         setChildVisibility(defaultReplyAll ? VISIBLE : GONE, mReplyAllButton);
     }
 
+    @SuppressLint("NewApi")
     private static void setChildMarginEnd(View childView, int marginEnd) {
         MarginLayoutParams mlp = (MarginLayoutParams) childView.getLayoutParams();
         if (Utils.isRunningJBMR1OrLater()) {
@@ -1299,7 +1315,7 @@
             renderExpandedDetails(getResources(), mExpandedDetailsView, mMessage.viaDomain,
                     mAddressCache, getAccount(), mVeiledMatcher, mFrom, mReplyTo, mTo, mCc, mBcc,
                     mMessageHeaderItem.getTimestampFull(),
-                    mMessageHeaderItem.getAdapter().getBidiFormatter());
+                    getBidiFormatter());
 
             mExpandedDetailsValid = true;
         }