commit a3831fb1589226a14adc67657f16204718c8ac74
author Paul Westbrook <pwestbro@google.com> Tue Aug 07 18:18:00 2012 -0700
committer Paul Westbrook <pwestbro@google.com> Tue Aug 07 18:18:23 2012 -0700
tree 3e80c8ed1d060930e3a5d42d07ae0a5ff3f05fce
parent ebc4bda7184ce659144eb95c7e73cb77ce3384da

Fix NPE

Bug: 6949444
Change-Id: Icdc44ebb7715053eed79e4daac923eb4cc705b62

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

diff --git a/src/com/android/mail/browse/SendersView.java b/src/com/android/mail/browse/SendersView.java
index 6bcc538..bb1d546 100644
--- a/src/com/android/mail/browse/SendersView.java
+++ b/src/com/android/mail/browse/SendersView.java
@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Typeface;
 import android.text.Html;
@@ -33,8 +32,6 @@
 import android.text.style.TextAppearanceSpan;
 import android.text.util.Rfc822Token;
 import android.text.util.Rfc822Tokenizer;
-import android.util.AttributeSet;
-import android.widget.TextView;
 
 import com.android.mail.R;
 import com.android.mail.providers.Address;

src/com/android/mail/widget/WidgetService.java

diff --git a/src/com/android/mail/widget/WidgetService.java b/src/com/android/mail/widget/WidgetService.java
index cac2b16..c771bd5 100644
--- a/src/com/android/mail/widget/WidgetService.java
+++ b/src/com/android/mail/widget/WidgetService.java
@@ -33,7 +33,6 @@
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.CursorLoader;
 import android.content.Intent;
@@ -45,12 +44,9 @@
 import android.net.Uri;
 import android.os.Looper;
 import android.support.v4.app.TaskStackBuilder;
-import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
-import android.text.TextPaint;
 import android.text.TextUtils;
-import android.text.TextUtils.TruncateAt;
 import android.text.format.DateUtils;
 import android.text.style.CharacterStyle;
 import android.text.style.TextAppearanceSpan;
@@ -418,11 +414,11 @@
         private SpannableStringBuilder ellipsizeStyledSenders(ConversationInfo info, int maxChars,
                 SpannableString[] styledSenders) {
             SpannableStringBuilder builder = new SpannableStringBuilder();
-            boolean ellipsize = false;
             SpannableString prevSender = null;
             for (SpannableString sender : styledSenders) {
-                if (ellipsize) {
-                    break;
+                if (sender == null) {
+                    LogUtils.e(LOG_TAG, "null sender while iterating over styledSenders");
+                    continue;
                 }
                 CharacterStyle[] spans = sender.getSpans(0, sender.length(), CharacterStyle.class);
                 if (SendersView.sElidedString.equals(sender.toString())) {