From 37e98419d7778656b39eba21d9061ccd01a20196 Mon Sep 17 00:00:00 2001 From: Andy Stadler <> Date: Wed, 15 Apr 2009 13:38:26 -0700 Subject: [PATCH] AI 146366: Automated g4 rollback of changelist 146361. *** Reason for rollback *** Despite the markings in the CL, this was inadvertently merged. This CL restores donut & downstream branches to the desired state. *** Original change description *** am: CL 146359 D* N*T M***E - we'll keep the fix for donut+ Automated g4 rollback of changelist 146273. *** Reason for rollback *** Inadvertently approved for cupcake, past deadline. *** Original change description *** Fixed "show pictures" button isnot displayed for HTML messages. Original author: stadler Merged from: //branches/cupcake/... BUG=1766880 Automated import of CL 146366 --- src/com/android/email/activity/MessageView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java index cfa9c4585..3928942a3 100644 --- a/src/com/android/email/activity/MessageView.java +++ b/src/com/android/email/activity/MessageView.java @@ -93,8 +93,8 @@ public class MessageView extends Activity }; private static final int METHODS_STATUS_COLUMN = 1; - // regex that matches start of img tag. '.*<(?i)img\s+.*'. - private static final Pattern IMG_TAG_START_REGEX = Pattern.compile(".*<(?i)img\\s+.*"); + // regex that matches start of img tag. '<(?i)img\s+'. + private static final Pattern IMG_TAG_START_REGEX = Pattern.compile("<(?i)img\\s+"); private TextView mSubjectView; private TextView mFromView; @@ -963,7 +963,7 @@ public class MessageView extends Activity * that HTML allows. */ // Check if text contains img tag. - if (IMG_TAG_START_REGEX.matcher(text).matches()) { + if (IMG_TAG_START_REGEX.matcher(text).find()) { mHandler.showShowPictures(true); }