moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 19:52:17 -05:00
Code Issues Releases Wiki Activity

Move our linkification and htmlification of mesages from on-display to on-sync.

Browse Source 
There's no need to defer this work until the user is waiting for it
This commit is contained in:
Jesse Vincent 2009-05-03 20:52:32 +00:00
parent f2fa5ae2f6
commit 323c294250
2 changed files with 60 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/android/email/activity/MessageView.java
View File

@ -31,7 +31,6 @@ import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.util.Regex; import android.text.util.Regex;
import android.text.util.Linkify;
import android.util.Config; import android.util.Config;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
@ -1065,41 +1064,6 @@ public class MessageView extends Activity
} }
if (part != null) { if (part != null) {
String text = MimeUtility.getTextFromPart(part); String text = MimeUtility.getTextFromPart(part);
if (part.getMimeType().equalsIgnoreCase("text/html")) {
markup = new SpannableString(text.replaceAll("cid:", "http://cid/"));
Linkify.addLinks(markup, Linkify.ALL);
text = markup.toString();
} else {
if(text.length() != 0) {
/*
* Convert plain text to HTML by replacing
* \r?\n with <br> and adding a html/body wrapper.
*/
text = text.replaceAll("&", "&amp;");
text = text.replaceAll("<", "&lt;");
text = text.replaceAll(">", "&gt;");
text = text.replaceAll("\r?\n", "<br/>");
Matcher m = Regex.WEB_URL_PATTERN.matcher(text);
StringBuffer sb = new StringBuffer(text.length() + 512);
sb.append("<html><body>");
while (m.find()) {
int start = m.start();
if (start == 0 || (start != 0 && text.charAt(start - 1) != '@')) {
m.appendReplacement(sb, "<a href=\"$0\">$0</a>");
}
else {
m.appendReplacement(sb, "$0");
}
}
m.appendTail(sb);
sb.append("</body></html>");
markup = new SpannableStringBuilder(sb, 0, sb.length());
Linkify.addLinks(markup, Linkify.ALL);
text = markup.toString();
}
else
text = "<html><body></body></html>";
}
/* /*
* TODO this should be smarter, change to regex for img, but consider how to * TODO this should be smarter, change to regex for img, but consider how to
* get background images and a million other things that HTML allows. * get background images and a million other things that HTML allows.
@ -1118,6 +1082,8 @@ public class MessageView extends Activity
} }
} }
@Override @Override
public void loadMessageForViewFailed(Account account, String folder, String uid, public void loadMessageForViewFailed(Account account, String folder, String uid,
final String message) { final String message) {

58
src/com/android/email/mail/store/LocalStore.java
View File

@ -15,6 +15,7 @@ import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.UUID; import java.util.UUID;
import java.util.regex.Matcher;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
@ -26,6 +27,11 @@ import android.database.sqlite.SQLiteDatabase;
import android.net.Uri; import android.net.Uri;
import android.util.Config; import android.util.Config;
import android.util.Log; import android.util.Log;
import android.text.util.Regex;
import android.text.util.Linkify;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.Preferences; import com.android.email.Preferences;
@ -57,7 +63,7 @@ import com.android.email.provider.AttachmentProvider;
* </pre> * </pre>
*/ */
public class LocalStore extends Store implements Serializable { public class LocalStore extends Store implements Serializable {
private static final int DB_VERSION = 23; private static final int DB_VERSION = 24;
private static final Flag[] PERMANENT_FLAGS = { Flag.DELETED, Flag.X_DESTROYED, Flag.SEEN }; private static final Flag[] PERMANENT_FLAGS = { Flag.DELETED, Flag.X_DESTROYED, Flag.SEEN };
private String mPath; private String mPath;
@ -1080,6 +1086,13 @@ public class LocalStore extends Store implements Serializable {
} }
} }
sbHtml = markupContent(sbText,sbHtml);
sbText = new StringBuffer();
try { try {
ContentValues cv = new ContentValues(); ContentValues cv = new ContentValues();
cv.put("uid", message.getUid()); cv.put("uid", message.getUid());
@ -1150,6 +1163,10 @@ public class LocalStore extends Store implements Serializable {
} }
} }
sbHtml = markupContent(sbText,sbHtml);
sbText = new StringBuffer();
try { try {
mDb.execSQL("UPDATE messages SET " mDb.execSQL("UPDATE messages SET "
+ "uid = ?, subject = ?, sender_list = ?, date = ?, flags = ?, " + "uid = ?, subject = ?, sender_list = ?, date = ?, flags = ?, "
@ -1423,6 +1440,45 @@ public class LocalStore extends Store implements Serializable {
} }
} }
} }
public StringBuffer markupContent(StringBuffer sbText, StringBuffer sbHtml) {
if (sbText.length() > 0 && sbHtml.length() == 0) {
sbHtml.append(htmlifyString(sbText.toString()));
}
Spannable markup = new SpannableString(sbHtml.toString().replaceAll("cid:", "http://cid/"));
Linkify.addLinks(markup, Linkify.ALL);
StringBuffer sb = new StringBuffer(markup.length());
sb.append(markup.toString());
return sb;
}
public String htmlifyString(String text) {
text = text.replaceAll("&", "&amp;");
text = text.replaceAll("<", "&lt;");
text = text.replaceAll(">", "&gt;");
text = text.replaceAll("\r?\n", "<br/>");
Matcher m = Regex.WEB_URL_PATTERN.matcher(text);
StringBuffer sb = new StringBuffer(text.length() + 512);
sb.append("<html><body>");
while (m.find()) {
int start = m.start();
if (start == 0 || (start != 0 && text.charAt(start - 1) != '@')) {
m.appendReplacement(sb, "<a href=\"$0\">$0</a>");
}
else {
m.appendReplacement(sb, "$0");
}
}
m.appendTail(sb);
sb.append("</body></html>");
text = sb.toString();
return text;
}
} }
public class LocalMessage extends MimeMessage { public class LocalMessage extends MimeMessage {