summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2014-07-24 14:12:52 -0700
committerAndrew Sapperstein <asapperstein@google.com>2014-07-24 14:12:52 -0700
commit0fd4cba8db984955729871d15a7cfebd73e9cf9d (patch)
tree1d2cbbf69810fd4f606eed47b598d866aaacfcec /src
parent3047a9f03d9febaf2aba1e5ea0827e0b740d1ab2 (diff)
downloadandroid_packages_apps_UnifiedEmail-0fd4cba8db984955729871d15a7cfebd73e9cf9d.tar.gz
android_packages_apps_UnifiedEmail-0fd4cba8db984955729871d15a7cfebd73e9cf9d.tar.bz2
android_packages_apps_UnifiedEmail-0fd4cba8db984955729871d15a7cfebd73e9cf9d.zip
Fix NPE for singular draft string. b/16323068
Change-Id: Iaed56eaf74a24537bfb927b404d896179a0dc3e5
Diffstat (limited to 'src')
-rw-r--r--src/com/android/mail/browse/MessageHeaderView.java2
-rw-r--r--src/com/android/mail/browse/SendersView.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 81f14891e..1242e6630 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -539,7 +539,7 @@ public class MessageHeaderView extends SnapHeader implements OnClickListener,
break;
default:
if (mIsDraft) {
- title = SendersView.getSingularDraftString();
+ title = SendersView.getSingularDraftString(getContext());
} else {
title = getBidiFormatter().unicodeWrap(
getSenderName(mSender));
diff --git a/src/com/android/mail/browse/SendersView.java b/src/com/android/mail/browse/SendersView.java
index ecb7c6794..3f05ab588 100644
--- a/src/com/android/mail/browse/SendersView.java
+++ b/src/com/android/mail/browse/SendersView.java
@@ -404,7 +404,8 @@ public class SendersView {
return formattedToHeader;
}
- public static SpannableString getSingularDraftString() {
+ public static SpannableString getSingularDraftString(Context context) {
+ getSenderResources(context, true /* resourceCachingRequired */);
final SpannableString formattedDraftString = new SpannableString(sDraftSingularString);
final CharacterStyle readStyle = CharacterStyle.wrap(sDraftsStyleSpan);
formattedDraftString.setSpan(readStyle, 0, formattedDraftString.length(), 0);