diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java index 0f82e1620..2199aaea2 100644 --- a/src/com/fsck/k9/Account.java +++ b/src/com/fsck/k9/Account.java @@ -314,7 +314,7 @@ public class Account implements BaseAccount try { mScrollMessageViewButtons = ScrollButtons.valueOf(prefs.getString(mUuid + ".hideButtonsEnum", - ScrollButtons.NEVER.name())); + ScrollButtons.NEVER.name())); } catch (Exception e) { @@ -324,7 +324,7 @@ public class Account implements BaseAccount try { mScrollMessageViewMoveButtons = ScrollButtons.valueOf(prefs.getString(mUuid + ".hideMoveButtonsEnum", - ScrollButtons.NEVER.name())); + ScrollButtons.NEVER.name())); } catch (Exception e) { @@ -702,7 +702,8 @@ public class Account implements BaseAccount } - public ColorChip generateColorChip() { + public ColorChip generateColorChip() + { return new ColorChip( mChipColor); } diff --git a/src/com/fsck/k9/activity/ActivityListener.java b/src/com/fsck/k9/activity/ActivityListener.java index 65f0378fe..1609f6375 100644 --- a/src/com/fsck/k9/activity/ActivityListener.java +++ b/src/com/fsck/k9/activity/ActivityListener.java @@ -73,7 +73,7 @@ public class ActivityListener extends MessagingListener } else { - operation = ""; // context.getString(R.string.status_polling_off); + operation = ""; // context.getString(R.string.status_polling_off); } } diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index a1b10eaeb..3bfb92ea3 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -2337,9 +2337,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc { StringBuilder quotedText = new StringBuilder(body.length() + QUOTE_BUFFER_LENGTH); quotedText.append(String.format( - getString(R.string.message_compose_reply_header_fmt), - Address.toString(originalMessage.getFrom())) - ); + getString(R.string.message_compose_reply_header_fmt), + Address.toString(originalMessage.getFrom())) + ); final String prefix = mAccount.getQuotePrefix(); final String wrappedText = Utility.wrap(body, REPLY_WRAP_LINE_WIDTH - prefix.length()); diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index cd740cbbb..440f972d4 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -2693,10 +2693,10 @@ public class MessageList ColorStateList color = holder.subject.getTextColors(); ColorStateList linkColor = holder.subject.getLinkTextColors(); str.setSpan(new TextAppearanceSpan(null, Typeface.NORMAL, mFontSizes.getMessageListSender(), color, linkColor), - 0, - noSender.length(), - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE - ); + 0, + noSender.length(), + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + ); } else { @@ -2782,18 +2782,18 @@ public class MessageList */ holder.preview.setText(new SpannableStringBuilder(recipientSigil(message)) - .append(message.sender).append(" ").append(message.message.getPreview()), - TextView.BufferType.SPANNABLE); + .append(message.sender).append(" ").append(message.message.getPreview()), + TextView.BufferType.SPANNABLE); Spannable str = (Spannable)holder.preview.getText(); // Create a span section for the sender, and assign the correct font size and weight. ColorStateList color = holder.subject.getTextColors(); ColorStateList linkColor = holder.subject.getLinkTextColors(); str.setSpan(new TextAppearanceSpan(null, senderTypeface, mFontSizes.getMessageListSender(), color, linkColor), - 0, - message.sender.length() + 1, - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE - ); + 0, + message.sender.length() + 1, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + ); } else { diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index 7ecd59f1e..d771b09c5 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -1391,7 +1391,7 @@ public class MessageView extends K9Activity implements OnClickListener private void onCopy() { if ((!MessagingController.getInstance(getApplication()).isCopyCapable(mAccount)) - || (mMessage == null)) + || (mMessage == null)) { return; } @@ -1964,15 +1964,15 @@ public class MessageView extends K9Activity implements OnClickListener Message message) { if (!mMessageReference.uid.equals(uid) || !mMessageReference.folderName.equals(folder) - || !mMessageReference.accountUuid.equals(account.getUuid())) + || !mMessageReference.accountUuid.equals(account.getUuid())) { return; } try { if (MessageView.this.mMessage != null - && MessageView.this.mMessage.isSet(Flag.X_DOWNLOADED_PARTIAL) - && message.isSet(Flag.X_DOWNLOADED_FULL)) + && MessageView.this.mMessage.isSet(Flag.X_DOWNLOADED_PARTIAL) + && message.isSet(Flag.X_DOWNLOADED_FULL)) { mHandler.setHeaders(message); } @@ -2156,7 +2156,7 @@ public class MessageView extends K9Activity implements OnClickListener try { File file = createUniqueFile(Environment.getExternalStorageDirectory(), - attachment.name); + attachment.name); Uri uri = AttachmentProvider.getAttachmentUri( mAccount, attachment.part.getAttachmentId()); diff --git a/src/com/fsck/k9/activity/setup/FontSizeSettings.java b/src/com/fsck/k9/activity/setup/FontSizeSettings.java index bc22b5f25..bf0369591 100644 --- a/src/com/fsck/k9/activity/setup/FontSizeSettings.java +++ b/src/com/fsck/k9/activity/setup/FontSizeSettings.java @@ -100,8 +100,8 @@ public class FontSizeSettings extends K9PreferenceActivity PREFERENCE_MESSAGE_LIST_DATE_FONT, Integer.toString(fontSizes.getMessageListDate())); mMessageListPreview = setupListPreference( - PREFERENCE_MESSAGE_LIST_PREVIEW_FONT, - Integer.toString(fontSizes.getMessageListPreview())); + PREFERENCE_MESSAGE_LIST_PREVIEW_FONT, + Integer.toString(fontSizes.getMessageListPreview())); mMessageViewSender = setupListPreference( PREFERENCE_MESSAGE_VIEW_SENDER_FONT, diff --git a/src/com/fsck/k9/helper/HtmlConverter.java b/src/com/fsck/k9/helper/HtmlConverter.java index c0975e03e..3a7862404 100644 --- a/src/com/fsck/k9/helper/HtmlConverter.java +++ b/src/com/fsck/k9/helper/HtmlConverter.java @@ -44,8 +44,8 @@ public class HtmlConverter public static String htmlToText(final String html) { return Html.fromHtml(html, null, new HtmlToTextTagHandler()).toString() - .replace(PREVIEW_OBJECT_CHARACTER, PREVIEW_OBJECT_REPLACEMENT) - .replace(NBSP_CHARACTER, NBSP_REPLACEMENT); + .replace(PREVIEW_OBJECT_CHARACTER, PREVIEW_OBJECT_REPLACEMENT) + .replace(NBSP_CHARACTER, NBSP_REPLACEMENT); } /** @@ -56,12 +56,15 @@ public class HtmlConverter private static class HtmlToTextTagHandler implements Html.TagHandler { // List of tags whose content should be ignored. - private static final Set TAGS_WITH_IGNORED_CONTENT = Collections.unmodifiableSet(new HashSet() {{ - add("style"); - add("script"); - add("title"); - add("!"); // comments - }}); + private static final Set TAGS_WITH_IGNORED_CONTENT = Collections.unmodifiableSet(new HashSet() + { + { + add("style"); + add("script"); + add("title"); + add("!"); // comments + } + }); @Override public void handleTag(boolean opening, String tag, Editable output, XMLReader xmlReader) @@ -96,7 +99,7 @@ public class HtmlConverter if (opening) { output.setSpan(new Annotation(IGNORED_ANNOTATION_KEY, IGNORED_ANNOTATION_VALUE), len, - len, Spannable.SPAN_MARK_MARK); + len, Spannable.SPAN_MARK_MARK); } else { diff --git a/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java b/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java index f0e630386..707e2b21e 100644 --- a/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java +++ b/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java @@ -4,8 +4,10 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.MalformedInputException; -class Iso2022JpToShiftJisInputStream extends InputStream { - private enum Charset { +class Iso2022JpToShiftJisInputStream extends InputStream +{ + private enum Charset + { ASCII, JISX0201, JISX0208, } @@ -63,24 +65,24 @@ class Iso2022JpToShiftJisInputStream extends InputStream { switch (charset) { - case ASCII: - return in1; - case JISX0201: - return in1 + 0x80; - case JISX0208: - int in2 = mIn.read(); - if (in2 < 0x21 || in2 >= 0x7e) - throw new MalformedInputException(0); + case ASCII: + return in1; + case JISX0201: + return in1 + 0x80; + case JISX0208: + int in2 = mIn.read(); + if (in2 < 0x21 || in2 >= 0x7e) + throw new MalformedInputException(0); - int out1 = (in1 + 1) / 2 + (in1 < 0x5f ? 0x70 : 0xb0); - int out2 = in2 + (in1 % 2 == 0 ? 0x7e : in2 < 0x60 ? 0x1f : 0x20); + int out1 = (in1 + 1) / 2 + (in1 < 0x5f ? 0x70 : 0xb0); + int out2 = in2 + (in1 % 2 == 0 ? 0x7e : in2 < 0x60 ? 0x1f : 0x20); - out = out2; - hasOut = true; + out = out2; + hasOut = true; - return out1; - default: - throw new RuntimeException(); + return out1; + default: + throw new RuntimeException(); } } } diff --git a/src/com/fsck/k9/mail/internet/MimeMessage.java b/src/com/fsck/k9/mail/internet/MimeMessage.java index 91d050bf2..dc04b1044 100644 --- a/src/com/fsck/k9/mail/internet/MimeMessage.java +++ b/src/com/fsck/k9/mail/internet/MimeMessage.java @@ -330,7 +330,7 @@ public class MimeMessage extends Message { mMessageId = getFirstHeader("Message-ID"); } - if (mMessageId == null) // even after checking the header + if (mMessageId == null) // even after checking the header { setMessageId(generateMessageId()); } diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/src/com/fsck/k9/mail/internet/MimeUtility.java index f21ccf3ad..6b46a51cb 100644 --- a/src/com/fsck/k9/mail/internet/MimeUtility.java +++ b/src/com/fsck/k9/mail/internet/MimeUtility.java @@ -1347,10 +1347,10 @@ public class MimeUtility private static String getJisVariantFromAddress(String address) { if (isInDomain(address, "docomo.ne.jp") || isInDomain(address, "dwmail.jp") || - isInDomain(address, "pdx.ne.jp") || isInDomain(address, "willcom.com")) + isInDomain(address, "pdx.ne.jp") || isInDomain(address, "willcom.com")) return "docomo"; else if (isInDomain(address, "softbank.ne.jp") || isInDomain(address, "vodafone.ne.jp") || - isInDomain(address, "disney.ne.jp") || isInDomain(address, "vertuclub.ne.jp")) + isInDomain(address, "disney.ne.jp") || isInDomain(address, "vertuclub.ne.jp")) return "softbank"; else if (isInDomain(address, "ezweb.ne.jp") || isInDomain(address, "ido.ne.jp")) return "kddi"; @@ -1441,505 +1441,991 @@ public class MimeUtility { switch (codePoint) { - case 0xE001: return 0xFE19B; - case 0xE002: return 0xFE19C; - case 0xE003: return 0xFE823; - case 0xE004: return 0xFE19D; - case 0xE005: return 0xFE19E; - case 0xE006: return 0xFE4CF; - case 0xE007: return 0xFE4CD; - case 0xE008: return 0xFE4EF; - case 0xE009: return 0xFE523; - case 0xE00A: return 0xFE525; - case 0xE00B: return 0xFE528; - case 0xE00C: return 0xFE538; - case 0xE00D: return 0xFEB96; - case 0xE00E: return 0xFEB97; - case 0xE00F: return 0xFEB98; - case 0xE010: return 0xFEB93; - case 0xE011: return 0xFEB94; - case 0xE012: return 0xFEB95; - case 0xE013: return 0xFE7D5; - case 0xE014: return 0xFE7D2; - case 0xE015: return 0xFE7D3; - case 0xE016: return 0xFE7D1; - case 0xE017: return 0xFE7DA; - case 0xE018: return 0xFE7D4; - case 0xE019: return 0xFE1BD; - case 0xE01A: return 0xFE1BE; - case 0xE01B: return 0xFE7E4; - case 0xE01C: return 0xFE7EA; - case 0xE01D: return 0xFE7E9; - case 0xE01E: return 0xFE7DF; - case 0xE01F: return 0xFE7E3; - case 0xE020: return 0xFEB09; - case 0xE021: return 0xFEB04; - case 0xE022: return 0xFEB0C; - case 0xE023: return 0xFEB0E; - case 0xE024: return 0xFE01E; - case 0xE025: return 0xFE01F; - case 0xE026: return 0xFE020; - case 0xE027: return 0xFE021; - case 0xE028: return 0xFE022; - case 0xE029: return 0xFE023; - case 0xE02A: return 0xFE024; - case 0xE02B: return 0xFE025; - case 0xE02C: return 0xFE026; - case 0xE02D: return 0xFE027; - case 0xE02E: return 0xFE028; - case 0xE02F: return 0xFE029; - case 0xE030: return 0xFE040; - case 0xE031: return 0xFE4D2; - case 0xE032: return 0xFE041; - case 0xE033: return 0xFE512; - case 0xE034: return 0xFE825; - case 0xE035: return 0xFE826; - case 0xE036: return 0xFE4B0; - case 0xE037: return 0xFE4BB; - case 0xE038: return 0xFE4B2; - case 0xE039: return 0xFE7EC; - case 0xE03A: return 0xFE7F5; - case 0xE03B: return 0xFE4C3; - case 0xE03C: return 0xFE800; - case 0xE03D: return 0xFE801; - case 0xE03E: return 0xFE813; - case 0xE03F: return 0xFEB82; - case 0xE040: return 0xFE815; - case 0xE041: return 0xFE816; - case 0xE042: return 0xFE818; - case 0xE043: return 0xFE980; - case 0xE044: return 0xFE982; - case 0xE045: return 0xFE981; - case 0xE046: return 0xFE962; - case 0xE047: return 0xFE983; - case 0xE048: return 0xFE003; - case 0xE049: return 0xFE001; - case 0xE04A: return 0xFE000; - case 0xE04B: return 0xFE002; - case 0xE04C: return 0xFE014; - case 0xE04D: return 0xFE009; - case 0xE04E: return 0xFE1AF; - case 0xE04F: return 0xFE1B8; - case 0xE050: return 0xFE1C0; - case 0xE051: return 0xFE1C1; - case 0xE052: return 0xFE1B7; - case 0xE053: return 0xFE1C2; - case 0xE054: return 0xFE1C3; - case 0xE055: return 0xFE1BC; - case 0xE056: return 0xFE335; - case 0xE057: return 0xFE330; - case 0xE058: return 0xFE323; - case 0xE059: return 0xFE320; - case 0xE05A: return 0xFE4F4; - case 0xE101: return 0xFE52D; - case 0xE102: return 0xFE52E; - case 0xE103: return 0xFE52B; - case 0xE104: return 0xFE526; - case 0xE105: return 0xFE329; - case 0xE106: return 0xFE327; - case 0xE107: return 0xFE341; - case 0xE108: return 0xFE344; - case 0xE109: return 0xFE1C4; - case 0xE10A: return 0xFE1C5; - case 0xE10B: return 0xFE1BF; - case 0xE10C: return 0xFE1B0; - case 0xE10D: return 0xFE7ED; - case 0xE10E: return 0xFE4D1; - case 0xE10F: return 0xFEB56; - case 0xE110: return 0xFE03C; - case 0xE111: return 0xFE827; - case 0xE112: return 0xFE510; - case 0xE113: return 0xFE4F5; - case 0xE114: return 0xFEB85; - case 0xE115: return 0xFE7D9; - case 0xE116: return 0xFE4CA; - case 0xE117: return 0xFE515; - case 0xE118: return 0xFE03F; - case 0xE119: return 0xFE042; - case 0xE11A: return 0xFE1B2; - case 0xE11B: return 0xFE1AE; - case 0xE11C: return 0xFE1B3; - case 0xE11D: return 0xFE4F6; - case 0xE11E: return 0xFE53B; - case 0xE11F: return 0xFE537; - case 0xE120: return 0xFE960; - case 0xE121: return 0xFE4BC; - case 0xE122: return 0xFE7FB; - case 0xE123: return 0xFE7FA; - case 0xE124: return 0xFE7FD; - case 0xE125: return 0xFE807; - case 0xE126: return 0xFE81D; - case 0xE127: return 0xFE81E; - case 0xE128: return 0xFE81F; - case 0xE129: return 0xFE820; - case 0xE12A: return 0xFE81C; - case 0xE12B: return 0xFE1B1; - case 0xE12C: return 0xFE81B; - case 0xE12D: return 0xFE80B; - case 0xE12E: return 0xFEB32; - case 0xE12F: return 0xFE4DD; - case 0xE130: return 0xFE80C; - case 0xE131: return 0xFE7DB; - case 0xE132: return 0xFE7D7; - case 0xE133: return 0xFE80D; - case 0xE134: return 0xFE7DC; - case 0xE135: return 0xFE7EE; - case 0xE136: return 0xFE7EB; - case 0xE137: return 0xFE7F8; - case 0xE138: return 0xFEB33; - case 0xE139: return 0xFEB34; - case 0xE13A: return 0xFEB35; - case 0xE13B: return 0xFE509; - case 0xE13C: return 0xFEB59; - case 0xE13D: return 0xFE004; - case 0xE13E: return 0xFE4D6; - case 0xE13F: return 0xFE505; - case 0xE140: return 0xFE507; - case 0xE141: return 0xFE821; - case 0xE142: return 0xFE52F; - case 0xE143: return 0xFE514; - case 0xE144: return 0xFEB86; - case 0xE145: return 0xFEB87; - case 0xE146: return 0xFE00B; - case 0xE147: return 0xFE965; - case 0xE148: return 0xFE546; - case 0xE149: return 0xFE4DE; - case 0xE14A: return 0xFE4DF; - case 0xE14B: return 0xFE531; - case 0xE14C: return 0xFEB5E; - case 0xE14D: return 0xFE4B5; - case 0xE14E: return 0xFE7F7; - case 0xE14F: return 0xFE7F6; - case 0xE150: return 0xFE7E7; - case 0xE151: return 0xFE506; - case 0xE152: return 0xFE1A1; - case 0xE153: return 0xFE4B3; - case 0xE154: return 0xFE4B6; - case 0xE155: return 0xFE4B4; - case 0xE156: return 0xFE4B9; - case 0xE157: return 0xFE4BA; - case 0xE158: return 0xFE4B7; - case 0xE159: return 0xFE7E6; - case 0xE15A: return 0xFE7EF; - case 0xE201: return 0xFE7F0; - case 0xE202: return 0xFE7E8; - case 0xE203: return 0xFEB24; - case 0xE204: return 0xFEB19; - case 0xE205: return 0xFEB61; - case 0xE206: return 0xFEB62; - case 0xE207: return 0xFEB25; - case 0xE208: return 0xFEB1F; - case 0xE209: return 0xFE044; - case 0xE20A: return 0xFEB20; - case 0xE20B: return 0xFE838; - case 0xE20C: return 0xFEB1A; - case 0xE20D: return 0xFEB1C; - case 0xE20E: return 0xFEB1B; - case 0xE20F: return 0xFEB1D; - case 0xE210: return 0xFE82C; - case 0xE211: return 0xFE82B; - case 0xE212: return 0xFEB36; - case 0xE213: return 0xFEB37; - case 0xE214: return 0xFEB38; - case 0xE215: return 0xFEB39; - case 0xE216: return 0xFEB3A; - case 0xE217: return 0xFEB3B; - case 0xE218: return 0xFEB3C; - case 0xE219: return 0xFEB63; - case 0xE21A: return 0xFEB64; - case 0xE21B: return 0xFEB67; - case 0xE21C: return 0xFE82E; - case 0xE21D: return 0xFE82F; - case 0xE21E: return 0xFE830; - case 0xE21F: return 0xFE831; - case 0xE220: return 0xFE832; - case 0xE221: return 0xFE833; - case 0xE222: return 0xFE834; - case 0xE223: return 0xFE835; - case 0xE224: return 0xFE836; - case 0xE225: return 0xFE837; - case 0xE226: return 0xFEB3D; - case 0xE227: return 0xFEB3E; - case 0xE228: return 0xFEB3F; - case 0xE229: return 0xFEB81; - case 0xE22A: return 0xFEB31; - case 0xE22B: return 0xFEB2F; - case 0xE22C: return 0xFEB40; - case 0xE22D: return 0xFEB41; - case 0xE22E: return 0xFEB99; - case 0xE22F: return 0xFEB9A; - case 0xE230: return 0xFEB9B; - case 0xE231: return 0xFEB9C; - case 0xE232: return 0xFEAF8; - case 0xE233: return 0xFEAF9; - case 0xE234: return 0xFEAFA; - case 0xE235: return 0xFEAFB; - case 0xE236: return 0xFEAF0; - case 0xE237: return 0xFEAF2; - case 0xE238: return 0xFEAF1; - case 0xE239: return 0xFEAF3; - case 0xE23A: return 0xFEAFC; - case 0xE23B: return 0xFEAFD; - case 0xE23C: return 0xFEAFE; - case 0xE23D: return 0xFEAFF; - case 0xE23E: return 0xFE4F8; - case 0xE23F: return 0xFE02B; - case 0xE240: return 0xFE02C; - case 0xE241: return 0xFE02D; - case 0xE242: return 0xFE02E; - case 0xE243: return 0xFE02F; - case 0xE244: return 0xFE030; - case 0xE245: return 0xFE031; - case 0xE246: return 0xFE032; - case 0xE247: return 0xFE033; - case 0xE248: return 0xFE034; - case 0xE249: return 0xFE035; - case 0xE24A: return 0xFE036; - case 0xE24B: return 0xFE037; - case 0xE24C: return 0xFEB42; - case 0xE24D: return 0xFEB27; - case 0xE24E: return 0xFEB29; - case 0xE24F: return 0xFEB2D; - case 0xE250: return 0xFE839; - case 0xE251: return 0xFE83A; - case 0xE252: return 0xFEB23; - case 0xE253: return 0xFE1B4; - case 0xE254: return 0xFEE77; - case 0xE255: return 0xFEE78; - case 0xE256: return 0xFEE79; - case 0xE257: return 0xFEE7A; - case 0xE258: return 0xFEE7B; - case 0xE259: return 0xFEE7C; - case 0xE25A: return 0xFEE7D; - case 0xE301: return 0xFE527; - case 0xE302: return 0xFE4D3; - case 0xE303: return 0xFE045; - case 0xE304: return 0xFE03D; - case 0xE305: return 0xFE046; - case 0xE306: return 0xFE828; - case 0xE307: return 0xFE047; - case 0xE308: return 0xFE048; - case 0xE309: return 0xFE508; - case 0xE30A: return 0xFE803; - case 0xE30B: return 0xFE985; - case 0xE30C: return 0xFE987; - case 0xE30D: return 0xFEB43; - case 0xE30E: return 0xFEB1E; - case 0xE30F: return 0xFE50A; - case 0xE310: return 0xFE516; - case 0xE311: return 0xFEB58; - case 0xE312: return 0xFE517; - case 0xE313: return 0xFE53E; - case 0xE314: return 0xFE50F; - case 0xE315: return 0xFEB2B; - case 0xE316: return 0xFE53C; - case 0xE317: return 0xFE530; - case 0xE318: return 0xFE4D4; - case 0xE319: return 0xFE4D5; - case 0xE31A: return 0xFE4D7; - case 0xE31B: return 0xFE4D8; - case 0xE31C: return 0xFE195; - case 0xE31D: return 0xFE196; - case 0xE31E: return 0xFE197; - case 0xE31F: return 0xFE198; - case 0xE320: return 0xFE199; - case 0xE321: return 0xFE4D9; - case 0xE322: return 0xFE4DA; - case 0xE323: return 0xFE4F0; - case 0xE324: return 0xFE808; - case 0xE325: return 0xFE4F2; - case 0xE326: return 0xFE814; - case 0xE327: return 0xFEB0D; - case 0xE328: return 0xFEB11; - case 0xE329: return 0xFEB12; - case 0xE32A: return 0xFEB13; - case 0xE32B: return 0xFEB14; - case 0xE32C: return 0xFEB15; - case 0xE32D: return 0xFEB16; - case 0xE32E: return 0xFEB60; - case 0xE32F: return 0xFEB68; - case 0xE330: return 0xFEB5D; - case 0xE331: return 0xFEB5B; - case 0xE332: return 0xFEB44; - case 0xE333: return 0xFEB45; - case 0xE334: return 0xFEB57; - case 0xE335: return 0xFEB69; - case 0xE336: return 0xFEB0A; - case 0xE337: return 0xFEB0B; - case 0xE338: return 0xFE984; - case 0xE339: return 0xFE964; - case 0xE33A: return 0xFE966; - case 0xE33B: return 0xFE967; - case 0xE33C: return 0xFE968; - case 0xE33D: return 0xFE969; - case 0xE33E: return 0xFE96A; - case 0xE33F: return 0xFE96B; - case 0xE340: return 0xFE963; - case 0xE341: return 0xFE96C; - case 0xE342: return 0xFE961; - case 0xE343: return 0xFE96D; - case 0xE344: return 0xFE96E; - case 0xE345: return 0xFE051; - case 0xE346: return 0xFE052; - case 0xE347: return 0xFE053; - case 0xE348: return 0xFE054; - case 0xE349: return 0xFE055; - case 0xE34A: return 0xFE056; - case 0xE34B: return 0xFE511; - case 0xE34C: return 0xFE96F; - case 0xE34D: return 0xFE970; - case 0xE401: return 0xFE345; - case 0xE402: return 0xFE343; - case 0xE403: return 0xFE340; - case 0xE404: return 0xFE333; - case 0xE405: return 0xFE347; - case 0xE406: return 0xFE33C; - case 0xE407: return 0xFE33F; - case 0xE408: return 0xFE342; - case 0xE409: return 0xFE32A; - case 0xE40A: return 0xFE33E; - case 0xE40B: return 0xFE33B; - case 0xE40C: return 0xFE32E; - case 0xE40D: return 0xFE32F; - case 0xE40E: return 0xFE326; - case 0xE40F: return 0xFE325; - case 0xE410: return 0xFE322; - case 0xE411: return 0xFE33A; - case 0xE412: return 0xFE334; - case 0xE413: return 0xFE339; - case 0xE414: return 0xFE336; - case 0xE415: return 0xFE338; - case 0xE416: return 0xFE33D; - case 0xE417: return 0xFE32D; - case 0xE418: return 0xFE32C; - case 0xE419: return 0xFE190; - case 0xE41A: return 0xFE192; - case 0xE41B: return 0xFE191; - case 0xE41C: return 0xFE193; - case 0xE41D: return 0xFE35B; - case 0xE41E: return 0xFEB9D; - case 0xE41F: return 0xFEB9E; - case 0xE420: return 0xFEB9F; - case 0xE421: return 0xFEBA0; - case 0xE422: return 0xFEBA1; - case 0xE423: return 0xFE351; - case 0xE424: return 0xFE352; - case 0xE425: return 0xFE829; - case 0xE426: return 0xFE353; - case 0xE427: return 0xFE358; - case 0xE428: return 0xFE1A0; - case 0xE429: return 0xFE1A2; - case 0xE42A: return 0xFE7D6; - case 0xE42B: return 0xFE7DD; - case 0xE42C: return 0xFE80E; - case 0xE42D: return 0xFE7DE; - case 0xE42E: return 0xFE7E5; - case 0xE42F: return 0xFE7F1; - case 0xE430: return 0xFE7F2; - case 0xE431: return 0xFE7F3; - case 0xE432: return 0xFE7F4; - case 0xE433: return 0xFE7FE; - case 0xE434: return 0xFE7E0; - case 0xE435: return 0xFE7E2; - case 0xE436: return 0xFE518; - case 0xE437: return 0xFEB17; - case 0xE438: return 0xFE519; - case 0xE439: return 0xFE51A; - case 0xE43A: return 0xFE51B; - case 0xE43B: return 0xFE51C; - case 0xE43C: return 0xFE007; - case 0xE43D: return 0xFE82A; - case 0xE43E: return 0xFE038; - case 0xE43F: return 0xFE971; - case 0xE440: return 0xFE51D; - case 0xE441: return 0xFE1C6; - case 0xE442: return 0xFE51E; - case 0xE443: return 0xFE005; - case 0xE444: return 0xFE049; - case 0xE445: return 0xFE51F; - case 0xE446: return 0xFE017; - case 0xE447: return 0xFE043; - case 0xE448: return 0xFE513; - case 0xE449: return 0xFE00A; - case 0xE44A: return 0xFE00C; - case 0xE44B: return 0xFE008; - case 0xE44C: return 0xFE00D; - case 0xE501: return 0xFE4B8; - case 0xE502: return 0xFE804; - case 0xE503: return 0xFE805; - case 0xE504: return 0xFE4BD; - case 0xE505: return 0xFE4BE; - case 0xE506: return 0xFE4BF; - case 0xE507: return 0xFE802; - case 0xE508: return 0xFE4C0; - case 0xE509: return 0xFE4C4; - case 0xE50A: return 0xFE4C5; - case 0xE50B: return 0xFE4E5; - case 0xE50C: return 0xFE4E6; - case 0xE50D: return 0xFE4E7; - case 0xE50E: return 0xFE4E8; - case 0xE50F: return 0xFE4E9; - case 0xE510: return 0xFE4EA; - case 0xE511: return 0xFE4EB; - case 0xE512: return 0xFE4EC; - case 0xE513: return 0xFE4ED; - case 0xE514: return 0xFE4EE; - case 0xE515: return 0xFE1A4; - case 0xE516: return 0xFE1A5; - case 0xE517: return 0xFE1A6; - case 0xE518: return 0xFE1A7; - case 0xE519: return 0xFE1A8; - case 0xE51A: return 0xFE1A9; - case 0xE51B: return 0xFE1AA; - case 0xE51C: return 0xFE1AB; - case 0xE51D: return 0xFE4C6; - case 0xE51E: return 0xFE1B5; - case 0xE51F: return 0xFE1B6; - case 0xE520: return 0xFE1C7; - case 0xE521: return 0xFE1C8; - case 0xE522: return 0xFE1C9; - case 0xE523: return 0xFE1BA; - case 0xE524: return 0xFE1CA; - case 0xE525: return 0xFE1CB; - case 0xE526: return 0xFE1CC; - case 0xE527: return 0xFE1CD; - case 0xE528: return 0xFE1CE; - case 0xE529: return 0xFE1CF; - case 0xE52A: return 0xFE1D0; - case 0xE52B: return 0xFE1D1; - case 0xE52C: return 0xFE1D2; - case 0xE52D: return 0xFE1D3; - case 0xE52E: return 0xFE1D4; - case 0xE52F: return 0xFE1D5; - case 0xE530: return 0xFE1D6; - case 0xE531: return 0xFE1D7; - case 0xE532: return 0xFE50B; - case 0xE533: return 0xFE50C; - case 0xE534: return 0xFE50D; - case 0xE535: return 0xFE50E; - case 0xE536: return 0xFE553; - case 0xE537: return 0xFEB2A; - case 0xE538: return 0xFEE70; - case 0xE539: return 0xFEE71; - case 0xE53A: return 0xFEE72; - case 0xE53B: return 0xFEE73; - case 0xE53C: return 0xFEE74; - case 0xE53D: return 0xFEE75; - case 0xE53E: return 0xFEE76; - default: return codePoint; + case 0xE001: + return 0xFE19B; + case 0xE002: + return 0xFE19C; + case 0xE003: + return 0xFE823; + case 0xE004: + return 0xFE19D; + case 0xE005: + return 0xFE19E; + case 0xE006: + return 0xFE4CF; + case 0xE007: + return 0xFE4CD; + case 0xE008: + return 0xFE4EF; + case 0xE009: + return 0xFE523; + case 0xE00A: + return 0xFE525; + case 0xE00B: + return 0xFE528; + case 0xE00C: + return 0xFE538; + case 0xE00D: + return 0xFEB96; + case 0xE00E: + return 0xFEB97; + case 0xE00F: + return 0xFEB98; + case 0xE010: + return 0xFEB93; + case 0xE011: + return 0xFEB94; + case 0xE012: + return 0xFEB95; + case 0xE013: + return 0xFE7D5; + case 0xE014: + return 0xFE7D2; + case 0xE015: + return 0xFE7D3; + case 0xE016: + return 0xFE7D1; + case 0xE017: + return 0xFE7DA; + case 0xE018: + return 0xFE7D4; + case 0xE019: + return 0xFE1BD; + case 0xE01A: + return 0xFE1BE; + case 0xE01B: + return 0xFE7E4; + case 0xE01C: + return 0xFE7EA; + case 0xE01D: + return 0xFE7E9; + case 0xE01E: + return 0xFE7DF; + case 0xE01F: + return 0xFE7E3; + case 0xE020: + return 0xFEB09; + case 0xE021: + return 0xFEB04; + case 0xE022: + return 0xFEB0C; + case 0xE023: + return 0xFEB0E; + case 0xE024: + return 0xFE01E; + case 0xE025: + return 0xFE01F; + case 0xE026: + return 0xFE020; + case 0xE027: + return 0xFE021; + case 0xE028: + return 0xFE022; + case 0xE029: + return 0xFE023; + case 0xE02A: + return 0xFE024; + case 0xE02B: + return 0xFE025; + case 0xE02C: + return 0xFE026; + case 0xE02D: + return 0xFE027; + case 0xE02E: + return 0xFE028; + case 0xE02F: + return 0xFE029; + case 0xE030: + return 0xFE040; + case 0xE031: + return 0xFE4D2; + case 0xE032: + return 0xFE041; + case 0xE033: + return 0xFE512; + case 0xE034: + return 0xFE825; + case 0xE035: + return 0xFE826; + case 0xE036: + return 0xFE4B0; + case 0xE037: + return 0xFE4BB; + case 0xE038: + return 0xFE4B2; + case 0xE039: + return 0xFE7EC; + case 0xE03A: + return 0xFE7F5; + case 0xE03B: + return 0xFE4C3; + case 0xE03C: + return 0xFE800; + case 0xE03D: + return 0xFE801; + case 0xE03E: + return 0xFE813; + case 0xE03F: + return 0xFEB82; + case 0xE040: + return 0xFE815; + case 0xE041: + return 0xFE816; + case 0xE042: + return 0xFE818; + case 0xE043: + return 0xFE980; + case 0xE044: + return 0xFE982; + case 0xE045: + return 0xFE981; + case 0xE046: + return 0xFE962; + case 0xE047: + return 0xFE983; + case 0xE048: + return 0xFE003; + case 0xE049: + return 0xFE001; + case 0xE04A: + return 0xFE000; + case 0xE04B: + return 0xFE002; + case 0xE04C: + return 0xFE014; + case 0xE04D: + return 0xFE009; + case 0xE04E: + return 0xFE1AF; + case 0xE04F: + return 0xFE1B8; + case 0xE050: + return 0xFE1C0; + case 0xE051: + return 0xFE1C1; + case 0xE052: + return 0xFE1B7; + case 0xE053: + return 0xFE1C2; + case 0xE054: + return 0xFE1C3; + case 0xE055: + return 0xFE1BC; + case 0xE056: + return 0xFE335; + case 0xE057: + return 0xFE330; + case 0xE058: + return 0xFE323; + case 0xE059: + return 0xFE320; + case 0xE05A: + return 0xFE4F4; + case 0xE101: + return 0xFE52D; + case 0xE102: + return 0xFE52E; + case 0xE103: + return 0xFE52B; + case 0xE104: + return 0xFE526; + case 0xE105: + return 0xFE329; + case 0xE106: + return 0xFE327; + case 0xE107: + return 0xFE341; + case 0xE108: + return 0xFE344; + case 0xE109: + return 0xFE1C4; + case 0xE10A: + return 0xFE1C5; + case 0xE10B: + return 0xFE1BF; + case 0xE10C: + return 0xFE1B0; + case 0xE10D: + return 0xFE7ED; + case 0xE10E: + return 0xFE4D1; + case 0xE10F: + return 0xFEB56; + case 0xE110: + return 0xFE03C; + case 0xE111: + return 0xFE827; + case 0xE112: + return 0xFE510; + case 0xE113: + return 0xFE4F5; + case 0xE114: + return 0xFEB85; + case 0xE115: + return 0xFE7D9; + case 0xE116: + return 0xFE4CA; + case 0xE117: + return 0xFE515; + case 0xE118: + return 0xFE03F; + case 0xE119: + return 0xFE042; + case 0xE11A: + return 0xFE1B2; + case 0xE11B: + return 0xFE1AE; + case 0xE11C: + return 0xFE1B3; + case 0xE11D: + return 0xFE4F6; + case 0xE11E: + return 0xFE53B; + case 0xE11F: + return 0xFE537; + case 0xE120: + return 0xFE960; + case 0xE121: + return 0xFE4BC; + case 0xE122: + return 0xFE7FB; + case 0xE123: + return 0xFE7FA; + case 0xE124: + return 0xFE7FD; + case 0xE125: + return 0xFE807; + case 0xE126: + return 0xFE81D; + case 0xE127: + return 0xFE81E; + case 0xE128: + return 0xFE81F; + case 0xE129: + return 0xFE820; + case 0xE12A: + return 0xFE81C; + case 0xE12B: + return 0xFE1B1; + case 0xE12C: + return 0xFE81B; + case 0xE12D: + return 0xFE80B; + case 0xE12E: + return 0xFEB32; + case 0xE12F: + return 0xFE4DD; + case 0xE130: + return 0xFE80C; + case 0xE131: + return 0xFE7DB; + case 0xE132: + return 0xFE7D7; + case 0xE133: + return 0xFE80D; + case 0xE134: + return 0xFE7DC; + case 0xE135: + return 0xFE7EE; + case 0xE136: + return 0xFE7EB; + case 0xE137: + return 0xFE7F8; + case 0xE138: + return 0xFEB33; + case 0xE139: + return 0xFEB34; + case 0xE13A: + return 0xFEB35; + case 0xE13B: + return 0xFE509; + case 0xE13C: + return 0xFEB59; + case 0xE13D: + return 0xFE004; + case 0xE13E: + return 0xFE4D6; + case 0xE13F: + return 0xFE505; + case 0xE140: + return 0xFE507; + case 0xE141: + return 0xFE821; + case 0xE142: + return 0xFE52F; + case 0xE143: + return 0xFE514; + case 0xE144: + return 0xFEB86; + case 0xE145: + return 0xFEB87; + case 0xE146: + return 0xFE00B; + case 0xE147: + return 0xFE965; + case 0xE148: + return 0xFE546; + case 0xE149: + return 0xFE4DE; + case 0xE14A: + return 0xFE4DF; + case 0xE14B: + return 0xFE531; + case 0xE14C: + return 0xFEB5E; + case 0xE14D: + return 0xFE4B5; + case 0xE14E: + return 0xFE7F7; + case 0xE14F: + return 0xFE7F6; + case 0xE150: + return 0xFE7E7; + case 0xE151: + return 0xFE506; + case 0xE152: + return 0xFE1A1; + case 0xE153: + return 0xFE4B3; + case 0xE154: + return 0xFE4B6; + case 0xE155: + return 0xFE4B4; + case 0xE156: + return 0xFE4B9; + case 0xE157: + return 0xFE4BA; + case 0xE158: + return 0xFE4B7; + case 0xE159: + return 0xFE7E6; + case 0xE15A: + return 0xFE7EF; + case 0xE201: + return 0xFE7F0; + case 0xE202: + return 0xFE7E8; + case 0xE203: + return 0xFEB24; + case 0xE204: + return 0xFEB19; + case 0xE205: + return 0xFEB61; + case 0xE206: + return 0xFEB62; + case 0xE207: + return 0xFEB25; + case 0xE208: + return 0xFEB1F; + case 0xE209: + return 0xFE044; + case 0xE20A: + return 0xFEB20; + case 0xE20B: + return 0xFE838; + case 0xE20C: + return 0xFEB1A; + case 0xE20D: + return 0xFEB1C; + case 0xE20E: + return 0xFEB1B; + case 0xE20F: + return 0xFEB1D; + case 0xE210: + return 0xFE82C; + case 0xE211: + return 0xFE82B; + case 0xE212: + return 0xFEB36; + case 0xE213: + return 0xFEB37; + case 0xE214: + return 0xFEB38; + case 0xE215: + return 0xFEB39; + case 0xE216: + return 0xFEB3A; + case 0xE217: + return 0xFEB3B; + case 0xE218: + return 0xFEB3C; + case 0xE219: + return 0xFEB63; + case 0xE21A: + return 0xFEB64; + case 0xE21B: + return 0xFEB67; + case 0xE21C: + return 0xFE82E; + case 0xE21D: + return 0xFE82F; + case 0xE21E: + return 0xFE830; + case 0xE21F: + return 0xFE831; + case 0xE220: + return 0xFE832; + case 0xE221: + return 0xFE833; + case 0xE222: + return 0xFE834; + case 0xE223: + return 0xFE835; + case 0xE224: + return 0xFE836; + case 0xE225: + return 0xFE837; + case 0xE226: + return 0xFEB3D; + case 0xE227: + return 0xFEB3E; + case 0xE228: + return 0xFEB3F; + case 0xE229: + return 0xFEB81; + case 0xE22A: + return 0xFEB31; + case 0xE22B: + return 0xFEB2F; + case 0xE22C: + return 0xFEB40; + case 0xE22D: + return 0xFEB41; + case 0xE22E: + return 0xFEB99; + case 0xE22F: + return 0xFEB9A; + case 0xE230: + return 0xFEB9B; + case 0xE231: + return 0xFEB9C; + case 0xE232: + return 0xFEAF8; + case 0xE233: + return 0xFEAF9; + case 0xE234: + return 0xFEAFA; + case 0xE235: + return 0xFEAFB; + case 0xE236: + return 0xFEAF0; + case 0xE237: + return 0xFEAF2; + case 0xE238: + return 0xFEAF1; + case 0xE239: + return 0xFEAF3; + case 0xE23A: + return 0xFEAFC; + case 0xE23B: + return 0xFEAFD; + case 0xE23C: + return 0xFEAFE; + case 0xE23D: + return 0xFEAFF; + case 0xE23E: + return 0xFE4F8; + case 0xE23F: + return 0xFE02B; + case 0xE240: + return 0xFE02C; + case 0xE241: + return 0xFE02D; + case 0xE242: + return 0xFE02E; + case 0xE243: + return 0xFE02F; + case 0xE244: + return 0xFE030; + case 0xE245: + return 0xFE031; + case 0xE246: + return 0xFE032; + case 0xE247: + return 0xFE033; + case 0xE248: + return 0xFE034; + case 0xE249: + return 0xFE035; + case 0xE24A: + return 0xFE036; + case 0xE24B: + return 0xFE037; + case 0xE24C: + return 0xFEB42; + case 0xE24D: + return 0xFEB27; + case 0xE24E: + return 0xFEB29; + case 0xE24F: + return 0xFEB2D; + case 0xE250: + return 0xFE839; + case 0xE251: + return 0xFE83A; + case 0xE252: + return 0xFEB23; + case 0xE253: + return 0xFE1B4; + case 0xE254: + return 0xFEE77; + case 0xE255: + return 0xFEE78; + case 0xE256: + return 0xFEE79; + case 0xE257: + return 0xFEE7A; + case 0xE258: + return 0xFEE7B; + case 0xE259: + return 0xFEE7C; + case 0xE25A: + return 0xFEE7D; + case 0xE301: + return 0xFE527; + case 0xE302: + return 0xFE4D3; + case 0xE303: + return 0xFE045; + case 0xE304: + return 0xFE03D; + case 0xE305: + return 0xFE046; + case 0xE306: + return 0xFE828; + case 0xE307: + return 0xFE047; + case 0xE308: + return 0xFE048; + case 0xE309: + return 0xFE508; + case 0xE30A: + return 0xFE803; + case 0xE30B: + return 0xFE985; + case 0xE30C: + return 0xFE987; + case 0xE30D: + return 0xFEB43; + case 0xE30E: + return 0xFEB1E; + case 0xE30F: + return 0xFE50A; + case 0xE310: + return 0xFE516; + case 0xE311: + return 0xFEB58; + case 0xE312: + return 0xFE517; + case 0xE313: + return 0xFE53E; + case 0xE314: + return 0xFE50F; + case 0xE315: + return 0xFEB2B; + case 0xE316: + return 0xFE53C; + case 0xE317: + return 0xFE530; + case 0xE318: + return 0xFE4D4; + case 0xE319: + return 0xFE4D5; + case 0xE31A: + return 0xFE4D7; + case 0xE31B: + return 0xFE4D8; + case 0xE31C: + return 0xFE195; + case 0xE31D: + return 0xFE196; + case 0xE31E: + return 0xFE197; + case 0xE31F: + return 0xFE198; + case 0xE320: + return 0xFE199; + case 0xE321: + return 0xFE4D9; + case 0xE322: + return 0xFE4DA; + case 0xE323: + return 0xFE4F0; + case 0xE324: + return 0xFE808; + case 0xE325: + return 0xFE4F2; + case 0xE326: + return 0xFE814; + case 0xE327: + return 0xFEB0D; + case 0xE328: + return 0xFEB11; + case 0xE329: + return 0xFEB12; + case 0xE32A: + return 0xFEB13; + case 0xE32B: + return 0xFEB14; + case 0xE32C: + return 0xFEB15; + case 0xE32D: + return 0xFEB16; + case 0xE32E: + return 0xFEB60; + case 0xE32F: + return 0xFEB68; + case 0xE330: + return 0xFEB5D; + case 0xE331: + return 0xFEB5B; + case 0xE332: + return 0xFEB44; + case 0xE333: + return 0xFEB45; + case 0xE334: + return 0xFEB57; + case 0xE335: + return 0xFEB69; + case 0xE336: + return 0xFEB0A; + case 0xE337: + return 0xFEB0B; + case 0xE338: + return 0xFE984; + case 0xE339: + return 0xFE964; + case 0xE33A: + return 0xFE966; + case 0xE33B: + return 0xFE967; + case 0xE33C: + return 0xFE968; + case 0xE33D: + return 0xFE969; + case 0xE33E: + return 0xFE96A; + case 0xE33F: + return 0xFE96B; + case 0xE340: + return 0xFE963; + case 0xE341: + return 0xFE96C; + case 0xE342: + return 0xFE961; + case 0xE343: + return 0xFE96D; + case 0xE344: + return 0xFE96E; + case 0xE345: + return 0xFE051; + case 0xE346: + return 0xFE052; + case 0xE347: + return 0xFE053; + case 0xE348: + return 0xFE054; + case 0xE349: + return 0xFE055; + case 0xE34A: + return 0xFE056; + case 0xE34B: + return 0xFE511; + case 0xE34C: + return 0xFE96F; + case 0xE34D: + return 0xFE970; + case 0xE401: + return 0xFE345; + case 0xE402: + return 0xFE343; + case 0xE403: + return 0xFE340; + case 0xE404: + return 0xFE333; + case 0xE405: + return 0xFE347; + case 0xE406: + return 0xFE33C; + case 0xE407: + return 0xFE33F; + case 0xE408: + return 0xFE342; + case 0xE409: + return 0xFE32A; + case 0xE40A: + return 0xFE33E; + case 0xE40B: + return 0xFE33B; + case 0xE40C: + return 0xFE32E; + case 0xE40D: + return 0xFE32F; + case 0xE40E: + return 0xFE326; + case 0xE40F: + return 0xFE325; + case 0xE410: + return 0xFE322; + case 0xE411: + return 0xFE33A; + case 0xE412: + return 0xFE334; + case 0xE413: + return 0xFE339; + case 0xE414: + return 0xFE336; + case 0xE415: + return 0xFE338; + case 0xE416: + return 0xFE33D; + case 0xE417: + return 0xFE32D; + case 0xE418: + return 0xFE32C; + case 0xE419: + return 0xFE190; + case 0xE41A: + return 0xFE192; + case 0xE41B: + return 0xFE191; + case 0xE41C: + return 0xFE193; + case 0xE41D: + return 0xFE35B; + case 0xE41E: + return 0xFEB9D; + case 0xE41F: + return 0xFEB9E; + case 0xE420: + return 0xFEB9F; + case 0xE421: + return 0xFEBA0; + case 0xE422: + return 0xFEBA1; + case 0xE423: + return 0xFE351; + case 0xE424: + return 0xFE352; + case 0xE425: + return 0xFE829; + case 0xE426: + return 0xFE353; + case 0xE427: + return 0xFE358; + case 0xE428: + return 0xFE1A0; + case 0xE429: + return 0xFE1A2; + case 0xE42A: + return 0xFE7D6; + case 0xE42B: + return 0xFE7DD; + case 0xE42C: + return 0xFE80E; + case 0xE42D: + return 0xFE7DE; + case 0xE42E: + return 0xFE7E5; + case 0xE42F: + return 0xFE7F1; + case 0xE430: + return 0xFE7F2; + case 0xE431: + return 0xFE7F3; + case 0xE432: + return 0xFE7F4; + case 0xE433: + return 0xFE7FE; + case 0xE434: + return 0xFE7E0; + case 0xE435: + return 0xFE7E2; + case 0xE436: + return 0xFE518; + case 0xE437: + return 0xFEB17; + case 0xE438: + return 0xFE519; + case 0xE439: + return 0xFE51A; + case 0xE43A: + return 0xFE51B; + case 0xE43B: + return 0xFE51C; + case 0xE43C: + return 0xFE007; + case 0xE43D: + return 0xFE82A; + case 0xE43E: + return 0xFE038; + case 0xE43F: + return 0xFE971; + case 0xE440: + return 0xFE51D; + case 0xE441: + return 0xFE1C6; + case 0xE442: + return 0xFE51E; + case 0xE443: + return 0xFE005; + case 0xE444: + return 0xFE049; + case 0xE445: + return 0xFE51F; + case 0xE446: + return 0xFE017; + case 0xE447: + return 0xFE043; + case 0xE448: + return 0xFE513; + case 0xE449: + return 0xFE00A; + case 0xE44A: + return 0xFE00C; + case 0xE44B: + return 0xFE008; + case 0xE44C: + return 0xFE00D; + case 0xE501: + return 0xFE4B8; + case 0xE502: + return 0xFE804; + case 0xE503: + return 0xFE805; + case 0xE504: + return 0xFE4BD; + case 0xE505: + return 0xFE4BE; + case 0xE506: + return 0xFE4BF; + case 0xE507: + return 0xFE802; + case 0xE508: + return 0xFE4C0; + case 0xE509: + return 0xFE4C4; + case 0xE50A: + return 0xFE4C5; + case 0xE50B: + return 0xFE4E5; + case 0xE50C: + return 0xFE4E6; + case 0xE50D: + return 0xFE4E7; + case 0xE50E: + return 0xFE4E8; + case 0xE50F: + return 0xFE4E9; + case 0xE510: + return 0xFE4EA; + case 0xE511: + return 0xFE4EB; + case 0xE512: + return 0xFE4EC; + case 0xE513: + return 0xFE4ED; + case 0xE514: + return 0xFE4EE; + case 0xE515: + return 0xFE1A4; + case 0xE516: + return 0xFE1A5; + case 0xE517: + return 0xFE1A6; + case 0xE518: + return 0xFE1A7; + case 0xE519: + return 0xFE1A8; + case 0xE51A: + return 0xFE1A9; + case 0xE51B: + return 0xFE1AA; + case 0xE51C: + return 0xFE1AB; + case 0xE51D: + return 0xFE4C6; + case 0xE51E: + return 0xFE1B5; + case 0xE51F: + return 0xFE1B6; + case 0xE520: + return 0xFE1C7; + case 0xE521: + return 0xFE1C8; + case 0xE522: + return 0xFE1C9; + case 0xE523: + return 0xFE1BA; + case 0xE524: + return 0xFE1CA; + case 0xE525: + return 0xFE1CB; + case 0xE526: + return 0xFE1CC; + case 0xE527: + return 0xFE1CD; + case 0xE528: + return 0xFE1CE; + case 0xE529: + return 0xFE1CF; + case 0xE52A: + return 0xFE1D0; + case 0xE52B: + return 0xFE1D1; + case 0xE52C: + return 0xFE1D2; + case 0xE52D: + return 0xFE1D3; + case 0xE52E: + return 0xFE1D4; + case 0xE52F: + return 0xFE1D5; + case 0xE530: + return 0xFE1D6; + case 0xE531: + return 0xFE1D7; + case 0xE532: + return 0xFE50B; + case 0xE533: + return 0xFE50C; + case 0xE534: + return 0xFE50D; + case 0xE535: + return 0xFE50E; + case 0xE536: + return 0xFE553; + case 0xE537: + return 0xFEB2A; + case 0xE538: + return 0xFEE70; + case 0xE539: + return 0xFEE71; + case 0xE53A: + return 0xFEE72; + case 0xE53B: + return 0xFEE73; + case 0xE53C: + return 0xFEE74; + case 0xE53D: + return 0xFEE75; + case 0xE53E: + return 0xFEE76; + default: + return codePoint; } } public static void setCharset(String charset, Part part) throws MessagingException { part.setHeader(MimeHeader.HEADER_CONTENT_TYPE, - part.getMimeType() + ";\n charset=" + getExternalCharset(charset)); + part.getMimeType() + ";\n charset=" + getExternalCharset(charset)); } public static String getExternalCharset(String charset) { if (charset.length() > 17 && charset.startsWith("x-") && - charset.endsWith("-shift_jis-2007")) + charset.endsWith("-shift_jis-2007")) return "shift_jis"; return charset; diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java index b5d0ea586..c45d5d693 100644 --- a/src/com/fsck/k9/mail/store/LocalStore.java +++ b/src/com/fsck/k9/mail/store/LocalStore.java @@ -2739,8 +2739,8 @@ public class LocalStore extends Store implements Serializable if (contentId != null && contentUri != null) { Cursor cursor = db.query("messages", new String[] - { "html_content" }, "id = ?", new String[] - { Long.toString(messageId) }, null, null, null); + { "html_content" }, "id = ?", new String[] + { Long.toString(messageId) }, null, null, null); try { if (cursor.moveToNext()) @@ -3139,7 +3139,7 @@ public class LocalStore extends Store implements Serializable { StringBuilder buff = new StringBuilder(html.length() + 512); for (int i = 0; i < html.length(); i = html.offsetByCodePoints(i, 1)) - { + { int codePoint = html.codePointAt(i); String emoji = getEmojiForCodePoint(codePoint); if (emoji != null) @@ -3156,419 +3156,832 @@ public class LocalStore extends Store implements Serializable // XXX: This doesn't cover all the characters. More emoticons are wanted. switch (codePoint) { - case 0xFE000: return "sun"; - case 0xFE001: return "cloud"; - case 0xFE002: return "rain"; - case 0xFE003: return "snow"; - case 0xFE004: return "thunder"; - case 0xFE005: return "typhoon"; - case 0xFE006: return "mist"; - case 0xFE007: return "sprinkle"; - case 0xFE008: return "night"; - case 0xFE009: return "sun"; - case 0xFE00A: return "sun"; - case 0xFE00C: return "sun"; - case 0xFE010: return "night"; - case 0xFE011: return "newmoon"; - case 0xFE012: return "moon1"; - case 0xFE013: return "moon2"; - case 0xFE014: return "moon3"; - case 0xFE015: return "fullmoon"; - case 0xFE016: return "moon2"; - case 0xFE018: return "soon"; - case 0xFE019: return "on"; - case 0xFE01A: return "end"; - case 0xFE01B: return "sandclock"; - case 0xFE01C: return "sandclock"; - case 0xFE01D: return "watch"; - case 0xFE01E: return "clock"; - case 0xFE01F: return "clock"; - case 0xFE020: return "clock"; - case 0xFE021: return "clock"; - case 0xFE022: return "clock"; - case 0xFE023: return "clock"; - case 0xFE024: return "clock"; - case 0xFE025: return "clock"; - case 0xFE026: return "clock"; - case 0xFE027: return "clock"; - case 0xFE028: return "clock"; - case 0xFE029: return "clock"; - case 0xFE02A: return "clock"; - case 0xFE02B: return "aries"; - case 0xFE02C: return "taurus"; - case 0xFE02D: return "gemini"; - case 0xFE02E: return "cancer"; - case 0xFE02F: return "leo"; - case 0xFE030: return "virgo"; - case 0xFE031: return "libra"; - case 0xFE032: return "scorpius"; - case 0xFE033: return "sagittarius"; - case 0xFE034: return "capricornus"; - case 0xFE035: return "aquarius"; - case 0xFE036: return "pisces"; - case 0xFE038: return "wave"; - case 0xFE03B: return "night"; - case 0xFE03C: return "clover"; - case 0xFE03D: return "tulip"; - case 0xFE03E: return "bud"; - case 0xFE03F: return "maple"; - case 0xFE040: return "cherryblossom"; - case 0xFE042: return "maple"; - case 0xFE04E: return "clover"; - case 0xFE04F: return "cherry"; - case 0xFE050: return "banana"; - case 0xFE051: return "apple"; - case 0xFE05B: return "apple"; - case 0xFE190: return "eye"; - case 0xFE191: return "ear"; - case 0xFE193: return "kissmark"; - case 0xFE194: return "bleah"; - case 0xFE195: return "rouge"; - case 0xFE198: return "hairsalon"; - case 0xFE19A: return "shadow"; - case 0xFE19B: return "happy01"; - case 0xFE19C: return "happy01"; - case 0xFE19D: return "happy01"; - case 0xFE19E: return "happy01"; - case 0xFE1B7: return "dog"; - case 0xFE1B8: return "cat"; - case 0xFE1B9: return "snail"; - case 0xFE1BA: return "chick"; - case 0xFE1BB: return "chick"; - case 0xFE1BC: return "penguin"; - case 0xFE1BD: return "fish"; - case 0xFE1BE: return "horse"; - case 0xFE1BF: return "pig"; - case 0xFE1C8: return "chick"; - case 0xFE1C9: return "fish"; - case 0xFE1CF: return "aries"; - case 0xFE1D0: return "dog"; - case 0xFE1D8: return "dog"; - case 0xFE1D9: return "fish"; - case 0xFE1DB: return "foot"; - case 0xFE1DD: return "chick"; - case 0xFE1E0: return "pig"; - case 0xFE1E3: return "cancer"; - case 0xFE320: return "angry"; - case 0xFE321: return "sad"; - case 0xFE322: return "wobbly"; - case 0xFE323: return "despair"; - case 0xFE324: return "wobbly"; - case 0xFE325: return "coldsweats02"; - case 0xFE326: return "gawk"; - case 0xFE327: return "lovely"; - case 0xFE328: return "smile"; - case 0xFE329: return "bleah"; - case 0xFE32A: return "bleah"; - case 0xFE32B: return "delicious"; - case 0xFE32C: return "lovely"; - case 0xFE32D: return "lovely"; - case 0xFE32F: return "happy02"; - case 0xFE330: return "happy01"; - case 0xFE331: return "coldsweats01"; - case 0xFE332: return "happy02"; - case 0xFE333: return "smile"; - case 0xFE334: return "happy02"; - case 0xFE335: return "delicious"; - case 0xFE336: return "happy01"; - case 0xFE337: return "happy01"; - case 0xFE338: return "coldsweats01"; - case 0xFE339: return "weep"; - case 0xFE33A: return "crying"; - case 0xFE33B: return "shock"; - case 0xFE33C: return "bearing"; - case 0xFE33D: return "pout"; - case 0xFE33E: return "confident"; - case 0xFE33F: return "sad"; - case 0xFE340: return "think"; - case 0xFE341: return "shock"; - case 0xFE342: return "sleepy"; - case 0xFE343: return "catface"; - case 0xFE344: return "coldsweats02"; - case 0xFE345: return "coldsweats02"; - case 0xFE346: return "bearing"; - case 0xFE347: return "wink"; - case 0xFE348: return "happy01"; - case 0xFE349: return "smile"; - case 0xFE34A: return "happy02"; - case 0xFE34B: return "lovely"; - case 0xFE34C: return "lovely"; - case 0xFE34D: return "weep"; - case 0xFE34E: return "pout"; - case 0xFE34F: return "smile"; - case 0xFE350: return "sad"; - case 0xFE351: return "ng"; - case 0xFE352: return "ok"; - case 0xFE357: return "paper"; - case 0xFE359: return "sad"; - case 0xFE35A: return "angry"; - case 0xFE4B0: return "house"; - case 0xFE4B1: return "house"; - case 0xFE4B2: return "building"; - case 0xFE4B3: return "postoffice"; - case 0xFE4B4: return "hospital"; - case 0xFE4B5: return "bank"; - case 0xFE4B6: return "atm"; - case 0xFE4B7: return "hotel"; - case 0xFE4B9: return "24hours"; - case 0xFE4BA: return "school"; - case 0xFE4C1: return "ship"; - case 0xFE4C2: return "bottle"; - case 0xFE4C3: return "fuji"; - case 0xFE4C9: return "wrench"; - case 0xFE4CC: return "shoe"; - case 0xFE4CD: return "shoe"; - case 0xFE4CE: return "eyeglass"; - case 0xFE4CF: return "t-shirt"; - case 0xFE4D0: return "denim"; - case 0xFE4D1: return "crown"; - case 0xFE4D2: return "crown"; - case 0xFE4D6: return "boutique"; - case 0xFE4D7: return "boutique"; - case 0xFE4DB: return "t-shirt"; - case 0xFE4DC: return "moneybag"; - case 0xFE4DD: return "dollar"; - case 0xFE4E0: return "dollar"; - case 0xFE4E2: return "yen"; - case 0xFE4E3: return "dollar"; - case 0xFE4EF: return "camera"; - case 0xFE4F0: return "bag"; - case 0xFE4F1: return "pouch"; - case 0xFE4F2: return "bell"; - case 0xFE4F3: return "door"; - case 0xFE4F9: return "movie"; - case 0xFE4FB: return "flair"; - case 0xFE4FD: return "sign05"; - case 0xFE4FF: return "book"; - case 0xFE500: return "book"; - case 0xFE501: return "book"; - case 0xFE502: return "book"; - case 0xFE503: return "book"; - case 0xFE505: return "spa"; - case 0xFE506: return "toilet"; - case 0xFE507: return "toilet"; - case 0xFE508: return "toilet"; - case 0xFE50F: return "ribbon"; - case 0xFE510: return "present"; - case 0xFE511: return "birthday"; - case 0xFE512: return "xmas"; - case 0xFE522: return "pocketbell"; - case 0xFE523: return "telephone"; - case 0xFE524: return "telephone"; - case 0xFE525: return "mobilephone"; - case 0xFE526: return "phoneto"; - case 0xFE527: return "memo"; - case 0xFE528: return "faxto"; - case 0xFE529: return "mail"; - case 0xFE52A: return "mailto"; - case 0xFE52B: return "mailto"; - case 0xFE52C: return "postoffice"; - case 0xFE52D: return "postoffice"; - case 0xFE52E: return "postoffice"; - case 0xFE535: return "present"; - case 0xFE536: return "pen"; - case 0xFE537: return "chair"; - case 0xFE538: return "pc"; - case 0xFE539: return "pencil"; - case 0xFE53A: return "clip"; - case 0xFE53B: return "bag"; - case 0xFE53E: return "hairsalon"; - case 0xFE540: return "memo"; - case 0xFE541: return "memo"; - case 0xFE545: return "book"; - case 0xFE546: return "book"; - case 0xFE547: return "book"; - case 0xFE548: return "memo"; - case 0xFE54D: return "book"; - case 0xFE54F: return "book"; - case 0xFE552: return "memo"; - case 0xFE553: return "foot"; - case 0xFE7D0: return "sports"; - case 0xFE7D1: return "baseball"; - case 0xFE7D2: return "golf"; - case 0xFE7D3: return "tennis"; - case 0xFE7D4: return "soccer"; - case 0xFE7D5: return "ski"; - case 0xFE7D6: return "basketball"; - case 0xFE7D7: return "motorsports"; - case 0xFE7D8: return "snowboard"; - case 0xFE7D9: return "run"; - case 0xFE7DA: return "snowboard"; - case 0xFE7DC: return "horse"; - case 0xFE7DF: return "train"; - case 0xFE7E0: return "subway"; - case 0xFE7E1: return "subway"; - case 0xFE7E2: return "bullettrain"; - case 0xFE7E3: return "bullettrain"; - case 0xFE7E4: return "car"; - case 0xFE7E5: return "rvcar"; - case 0xFE7E6: return "bus"; - case 0xFE7E8: return "ship"; - case 0xFE7E9: return "airplane"; - case 0xFE7EA: return "yacht"; - case 0xFE7EB: return "bicycle"; - case 0xFE7EE: return "yacht"; - case 0xFE7EF: return "car"; - case 0xFE7F0: return "run"; - case 0xFE7F5: return "gasstation"; - case 0xFE7F6: return "parking"; - case 0xFE7F7: return "signaler"; - case 0xFE7FA: return "spa"; - case 0xFE7FC: return "carouselpony"; - case 0xFE7FF: return "fish"; - case 0xFE800: return "karaoke"; - case 0xFE801: return "movie"; - case 0xFE802: return "movie"; - case 0xFE803: return "music"; - case 0xFE804: return "art"; - case 0xFE805: return "drama"; - case 0xFE806: return "event"; - case 0xFE807: return "ticket"; - case 0xFE808: return "slate"; - case 0xFE809: return "drama"; - case 0xFE80A: return "game"; - case 0xFE813: return "note"; - case 0xFE814: return "notes"; - case 0xFE81A: return "notes"; - case 0xFE81C: return "tv"; - case 0xFE81D: return "cd"; - case 0xFE81E: return "cd"; - case 0xFE823: return "kissmark"; - case 0xFE824: return "loveletter"; - case 0xFE825: return "ring"; - case 0xFE826: return "ring"; - case 0xFE827: return "kissmark"; - case 0xFE829: return "heart02"; - case 0xFE82B: return "freedial"; - case 0xFE82C: return "sharp"; - case 0xFE82D: return "mobaq"; - case 0xFE82E: return "one"; - case 0xFE82F: return "two"; - case 0xFE830: return "three"; - case 0xFE831: return "four"; - case 0xFE832: return "five"; - case 0xFE833: return "six"; - case 0xFE834: return "seven"; - case 0xFE835: return "eight"; - case 0xFE836: return "nine"; - case 0xFE837: return "zero"; - case 0xFE960: return "fastfood"; - case 0xFE961: return "riceball"; - case 0xFE962: return "cake"; - case 0xFE963: return "noodle"; - case 0xFE964: return "bread"; - case 0xFE96A: return "noodle"; - case 0xFE973: return "typhoon"; - case 0xFE980: return "restaurant"; - case 0xFE981: return "cafe"; - case 0xFE982: return "bar"; - case 0xFE983: return "beer"; - case 0xFE984: return "japanesetea"; - case 0xFE985: return "bottle"; - case 0xFE986: return "wine"; - case 0xFE987: return "beer"; - case 0xFE988: return "bar"; - case 0xFEAF0: return "upwardright"; - case 0xFEAF1: return "downwardright"; - case 0xFEAF2: return "upwardleft"; - case 0xFEAF3: return "downwardleft"; - case 0xFEAF4: return "up"; - case 0xFEAF5: return "down"; - case 0xFEAF6: return "leftright"; - case 0xFEAF7: return "updown"; - case 0xFEB04: return "sign01"; - case 0xFEB05: return "sign02"; - case 0xFEB06: return "sign03"; - case 0xFEB07: return "sign04"; - case 0xFEB08: return "sign05"; - case 0xFEB0B: return "sign01"; - case 0xFEB0C: return "heart01"; - case 0xFEB0D: return "heart02"; - case 0xFEB0E: return "heart03"; - case 0xFEB0F: return "heart04"; - case 0xFEB10: return "heart01"; - case 0xFEB11: return "heart02"; - case 0xFEB12: return "heart01"; - case 0xFEB13: return "heart01"; - case 0xFEB14: return "heart01"; - case 0xFEB15: return "heart01"; - case 0xFEB16: return "heart01"; - case 0xFEB17: return "heart01"; - case 0xFEB18: return "heart02"; - case 0xFEB19: return "cute"; - case 0xFEB1A: return "heart"; - case 0xFEB1B: return "spade"; - case 0xFEB1C: return "diamond"; - case 0xFEB1D: return "club"; - case 0xFEB1E: return "smoking"; - case 0xFEB1F: return "nosmoking"; - case 0xFEB20: return "wheelchair"; - case 0xFEB21: return "free"; - case 0xFEB22: return "flag"; - case 0xFEB23: return "danger"; - case 0xFEB26: return "ng"; - case 0xFEB27: return "ok"; - case 0xFEB28: return "ng"; - case 0xFEB29: return "copyright"; - case 0xFEB2A: return "tm"; - case 0xFEB2B: return "secret"; - case 0xFEB2C: return "recycle"; - case 0xFEB2D: return "r-mark"; - case 0xFEB2E: return "ban"; - case 0xFEB2F: return "empty"; - case 0xFEB30: return "pass"; - case 0xFEB31: return "full"; - case 0xFEB36: return "new"; - case 0xFEB44: return "fullmoon"; - case 0xFEB48: return "ban"; - case 0xFEB55: return "cute"; - case 0xFEB56: return "flair"; - case 0xFEB57: return "annoy"; - case 0xFEB58: return "bomb"; - case 0xFEB59: return "sleepy"; - case 0xFEB5A: return "impact"; - case 0xFEB5B: return "sweat01"; - case 0xFEB5C: return "sweat02"; - case 0xFEB5D: return "dash"; - case 0xFEB5F: return "sad"; - case 0xFEB60: return "shine"; - case 0xFEB61: return "cute"; - case 0xFEB62: return "cute"; - case 0xFEB63: return "newmoon"; - case 0xFEB64: return "newmoon"; - case 0xFEB65: return "newmoon"; - case 0xFEB66: return "newmoon"; - case 0xFEB67: return "newmoon"; - case 0xFEB77: return "shine"; - case 0xFEB81: return "id"; - case 0xFEB82: return "key"; - case 0xFEB83: return "enter"; - case 0xFEB84: return "clear"; - case 0xFEB85: return "search"; - case 0xFEB86: return "key"; - case 0xFEB87: return "key"; - case 0xFEB8A: return "key"; - case 0xFEB8D: return "search"; - case 0xFEB90: return "key"; - case 0xFEB91: return "recycle"; - case 0xFEB92: return "mail"; - case 0xFEB93: return "rock"; - case 0xFEB94: return "scissors"; - case 0xFEB95: return "paper"; - case 0xFEB96: return "punch"; - case 0xFEB97: return "good"; - case 0xFEB9D: return "paper"; - case 0xFEB9F: return "ok"; - case 0xFEBA0: return "down"; - case 0xFEBA1: return "paper"; - case 0xFEE10: return "info01"; - case 0xFEE11: return "info02"; - case 0xFEE12: return "by-d"; - case 0xFEE13: return "d-point"; - case 0xFEE14: return "appli01"; - case 0xFEE15: return "appli02"; - case 0xFEE1C: return "movie"; - default: return null; + case 0xFE000: + return "sun"; + case 0xFE001: + return "cloud"; + case 0xFE002: + return "rain"; + case 0xFE003: + return "snow"; + case 0xFE004: + return "thunder"; + case 0xFE005: + return "typhoon"; + case 0xFE006: + return "mist"; + case 0xFE007: + return "sprinkle"; + case 0xFE008: + return "night"; + case 0xFE009: + return "sun"; + case 0xFE00A: + return "sun"; + case 0xFE00C: + return "sun"; + case 0xFE010: + return "night"; + case 0xFE011: + return "newmoon"; + case 0xFE012: + return "moon1"; + case 0xFE013: + return "moon2"; + case 0xFE014: + return "moon3"; + case 0xFE015: + return "fullmoon"; + case 0xFE016: + return "moon2"; + case 0xFE018: + return "soon"; + case 0xFE019: + return "on"; + case 0xFE01A: + return "end"; + case 0xFE01B: + return "sandclock"; + case 0xFE01C: + return "sandclock"; + case 0xFE01D: + return "watch"; + case 0xFE01E: + return "clock"; + case 0xFE01F: + return "clock"; + case 0xFE020: + return "clock"; + case 0xFE021: + return "clock"; + case 0xFE022: + return "clock"; + case 0xFE023: + return "clock"; + case 0xFE024: + return "clock"; + case 0xFE025: + return "clock"; + case 0xFE026: + return "clock"; + case 0xFE027: + return "clock"; + case 0xFE028: + return "clock"; + case 0xFE029: + return "clock"; + case 0xFE02A: + return "clock"; + case 0xFE02B: + return "aries"; + case 0xFE02C: + return "taurus"; + case 0xFE02D: + return "gemini"; + case 0xFE02E: + return "cancer"; + case 0xFE02F: + return "leo"; + case 0xFE030: + return "virgo"; + case 0xFE031: + return "libra"; + case 0xFE032: + return "scorpius"; + case 0xFE033: + return "sagittarius"; + case 0xFE034: + return "capricornus"; + case 0xFE035: + return "aquarius"; + case 0xFE036: + return "pisces"; + case 0xFE038: + return "wave"; + case 0xFE03B: + return "night"; + case 0xFE03C: + return "clover"; + case 0xFE03D: + return "tulip"; + case 0xFE03E: + return "bud"; + case 0xFE03F: + return "maple"; + case 0xFE040: + return "cherryblossom"; + case 0xFE042: + return "maple"; + case 0xFE04E: + return "clover"; + case 0xFE04F: + return "cherry"; + case 0xFE050: + return "banana"; + case 0xFE051: + return "apple"; + case 0xFE05B: + return "apple"; + case 0xFE190: + return "eye"; + case 0xFE191: + return "ear"; + case 0xFE193: + return "kissmark"; + case 0xFE194: + return "bleah"; + case 0xFE195: + return "rouge"; + case 0xFE198: + return "hairsalon"; + case 0xFE19A: + return "shadow"; + case 0xFE19B: + return "happy01"; + case 0xFE19C: + return "happy01"; + case 0xFE19D: + return "happy01"; + case 0xFE19E: + return "happy01"; + case 0xFE1B7: + return "dog"; + case 0xFE1B8: + return "cat"; + case 0xFE1B9: + return "snail"; + case 0xFE1BA: + return "chick"; + case 0xFE1BB: + return "chick"; + case 0xFE1BC: + return "penguin"; + case 0xFE1BD: + return "fish"; + case 0xFE1BE: + return "horse"; + case 0xFE1BF: + return "pig"; + case 0xFE1C8: + return "chick"; + case 0xFE1C9: + return "fish"; + case 0xFE1CF: + return "aries"; + case 0xFE1D0: + return "dog"; + case 0xFE1D8: + return "dog"; + case 0xFE1D9: + return "fish"; + case 0xFE1DB: + return "foot"; + case 0xFE1DD: + return "chick"; + case 0xFE1E0: + return "pig"; + case 0xFE1E3: + return "cancer"; + case 0xFE320: + return "angry"; + case 0xFE321: + return "sad"; + case 0xFE322: + return "wobbly"; + case 0xFE323: + return "despair"; + case 0xFE324: + return "wobbly"; + case 0xFE325: + return "coldsweats02"; + case 0xFE326: + return "gawk"; + case 0xFE327: + return "lovely"; + case 0xFE328: + return "smile"; + case 0xFE329: + return "bleah"; + case 0xFE32A: + return "bleah"; + case 0xFE32B: + return "delicious"; + case 0xFE32C: + return "lovely"; + case 0xFE32D: + return "lovely"; + case 0xFE32F: + return "happy02"; + case 0xFE330: + return "happy01"; + case 0xFE331: + return "coldsweats01"; + case 0xFE332: + return "happy02"; + case 0xFE333: + return "smile"; + case 0xFE334: + return "happy02"; + case 0xFE335: + return "delicious"; + case 0xFE336: + return "happy01"; + case 0xFE337: + return "happy01"; + case 0xFE338: + return "coldsweats01"; + case 0xFE339: + return "weep"; + case 0xFE33A: + return "crying"; + case 0xFE33B: + return "shock"; + case 0xFE33C: + return "bearing"; + case 0xFE33D: + return "pout"; + case 0xFE33E: + return "confident"; + case 0xFE33F: + return "sad"; + case 0xFE340: + return "think"; + case 0xFE341: + return "shock"; + case 0xFE342: + return "sleepy"; + case 0xFE343: + return "catface"; + case 0xFE344: + return "coldsweats02"; + case 0xFE345: + return "coldsweats02"; + case 0xFE346: + return "bearing"; + case 0xFE347: + return "wink"; + case 0xFE348: + return "happy01"; + case 0xFE349: + return "smile"; + case 0xFE34A: + return "happy02"; + case 0xFE34B: + return "lovely"; + case 0xFE34C: + return "lovely"; + case 0xFE34D: + return "weep"; + case 0xFE34E: + return "pout"; + case 0xFE34F: + return "smile"; + case 0xFE350: + return "sad"; + case 0xFE351: + return "ng"; + case 0xFE352: + return "ok"; + case 0xFE357: + return "paper"; + case 0xFE359: + return "sad"; + case 0xFE35A: + return "angry"; + case 0xFE4B0: + return "house"; + case 0xFE4B1: + return "house"; + case 0xFE4B2: + return "building"; + case 0xFE4B3: + return "postoffice"; + case 0xFE4B4: + return "hospital"; + case 0xFE4B5: + return "bank"; + case 0xFE4B6: + return "atm"; + case 0xFE4B7: + return "hotel"; + case 0xFE4B9: + return "24hours"; + case 0xFE4BA: + return "school"; + case 0xFE4C1: + return "ship"; + case 0xFE4C2: + return "bottle"; + case 0xFE4C3: + return "fuji"; + case 0xFE4C9: + return "wrench"; + case 0xFE4CC: + return "shoe"; + case 0xFE4CD: + return "shoe"; + case 0xFE4CE: + return "eyeglass"; + case 0xFE4CF: + return "t-shirt"; + case 0xFE4D0: + return "denim"; + case 0xFE4D1: + return "crown"; + case 0xFE4D2: + return "crown"; + case 0xFE4D6: + return "boutique"; + case 0xFE4D7: + return "boutique"; + case 0xFE4DB: + return "t-shirt"; + case 0xFE4DC: + return "moneybag"; + case 0xFE4DD: + return "dollar"; + case 0xFE4E0: + return "dollar"; + case 0xFE4E2: + return "yen"; + case 0xFE4E3: + return "dollar"; + case 0xFE4EF: + return "camera"; + case 0xFE4F0: + return "bag"; + case 0xFE4F1: + return "pouch"; + case 0xFE4F2: + return "bell"; + case 0xFE4F3: + return "door"; + case 0xFE4F9: + return "movie"; + case 0xFE4FB: + return "flair"; + case 0xFE4FD: + return "sign05"; + case 0xFE4FF: + return "book"; + case 0xFE500: + return "book"; + case 0xFE501: + return "book"; + case 0xFE502: + return "book"; + case 0xFE503: + return "book"; + case 0xFE505: + return "spa"; + case 0xFE506: + return "toilet"; + case 0xFE507: + return "toilet"; + case 0xFE508: + return "toilet"; + case 0xFE50F: + return "ribbon"; + case 0xFE510: + return "present"; + case 0xFE511: + return "birthday"; + case 0xFE512: + return "xmas"; + case 0xFE522: + return "pocketbell"; + case 0xFE523: + return "telephone"; + case 0xFE524: + return "telephone"; + case 0xFE525: + return "mobilephone"; + case 0xFE526: + return "phoneto"; + case 0xFE527: + return "memo"; + case 0xFE528: + return "faxto"; + case 0xFE529: + return "mail"; + case 0xFE52A: + return "mailto"; + case 0xFE52B: + return "mailto"; + case 0xFE52C: + return "postoffice"; + case 0xFE52D: + return "postoffice"; + case 0xFE52E: + return "postoffice"; + case 0xFE535: + return "present"; + case 0xFE536: + return "pen"; + case 0xFE537: + return "chair"; + case 0xFE538: + return "pc"; + case 0xFE539: + return "pencil"; + case 0xFE53A: + return "clip"; + case 0xFE53B: + return "bag"; + case 0xFE53E: + return "hairsalon"; + case 0xFE540: + return "memo"; + case 0xFE541: + return "memo"; + case 0xFE545: + return "book"; + case 0xFE546: + return "book"; + case 0xFE547: + return "book"; + case 0xFE548: + return "memo"; + case 0xFE54D: + return "book"; + case 0xFE54F: + return "book"; + case 0xFE552: + return "memo"; + case 0xFE553: + return "foot"; + case 0xFE7D0: + return "sports"; + case 0xFE7D1: + return "baseball"; + case 0xFE7D2: + return "golf"; + case 0xFE7D3: + return "tennis"; + case 0xFE7D4: + return "soccer"; + case 0xFE7D5: + return "ski"; + case 0xFE7D6: + return "basketball"; + case 0xFE7D7: + return "motorsports"; + case 0xFE7D8: + return "snowboard"; + case 0xFE7D9: + return "run"; + case 0xFE7DA: + return "snowboard"; + case 0xFE7DC: + return "horse"; + case 0xFE7DF: + return "train"; + case 0xFE7E0: + return "subway"; + case 0xFE7E1: + return "subway"; + case 0xFE7E2: + return "bullettrain"; + case 0xFE7E3: + return "bullettrain"; + case 0xFE7E4: + return "car"; + case 0xFE7E5: + return "rvcar"; + case 0xFE7E6: + return "bus"; + case 0xFE7E8: + return "ship"; + case 0xFE7E9: + return "airplane"; + case 0xFE7EA: + return "yacht"; + case 0xFE7EB: + return "bicycle"; + case 0xFE7EE: + return "yacht"; + case 0xFE7EF: + return "car"; + case 0xFE7F0: + return "run"; + case 0xFE7F5: + return "gasstation"; + case 0xFE7F6: + return "parking"; + case 0xFE7F7: + return "signaler"; + case 0xFE7FA: + return "spa"; + case 0xFE7FC: + return "carouselpony"; + case 0xFE7FF: + return "fish"; + case 0xFE800: + return "karaoke"; + case 0xFE801: + return "movie"; + case 0xFE802: + return "movie"; + case 0xFE803: + return "music"; + case 0xFE804: + return "art"; + case 0xFE805: + return "drama"; + case 0xFE806: + return "event"; + case 0xFE807: + return "ticket"; + case 0xFE808: + return "slate"; + case 0xFE809: + return "drama"; + case 0xFE80A: + return "game"; + case 0xFE813: + return "note"; + case 0xFE814: + return "notes"; + case 0xFE81A: + return "notes"; + case 0xFE81C: + return "tv"; + case 0xFE81D: + return "cd"; + case 0xFE81E: + return "cd"; + case 0xFE823: + return "kissmark"; + case 0xFE824: + return "loveletter"; + case 0xFE825: + return "ring"; + case 0xFE826: + return "ring"; + case 0xFE827: + return "kissmark"; + case 0xFE829: + return "heart02"; + case 0xFE82B: + return "freedial"; + case 0xFE82C: + return "sharp"; + case 0xFE82D: + return "mobaq"; + case 0xFE82E: + return "one"; + case 0xFE82F: + return "two"; + case 0xFE830: + return "three"; + case 0xFE831: + return "four"; + case 0xFE832: + return "five"; + case 0xFE833: + return "six"; + case 0xFE834: + return "seven"; + case 0xFE835: + return "eight"; + case 0xFE836: + return "nine"; + case 0xFE837: + return "zero"; + case 0xFE960: + return "fastfood"; + case 0xFE961: + return "riceball"; + case 0xFE962: + return "cake"; + case 0xFE963: + return "noodle"; + case 0xFE964: + return "bread"; + case 0xFE96A: + return "noodle"; + case 0xFE973: + return "typhoon"; + case 0xFE980: + return "restaurant"; + case 0xFE981: + return "cafe"; + case 0xFE982: + return "bar"; + case 0xFE983: + return "beer"; + case 0xFE984: + return "japanesetea"; + case 0xFE985: + return "bottle"; + case 0xFE986: + return "wine"; + case 0xFE987: + return "beer"; + case 0xFE988: + return "bar"; + case 0xFEAF0: + return "upwardright"; + case 0xFEAF1: + return "downwardright"; + case 0xFEAF2: + return "upwardleft"; + case 0xFEAF3: + return "downwardleft"; + case 0xFEAF4: + return "up"; + case 0xFEAF5: + return "down"; + case 0xFEAF6: + return "leftright"; + case 0xFEAF7: + return "updown"; + case 0xFEB04: + return "sign01"; + case 0xFEB05: + return "sign02"; + case 0xFEB06: + return "sign03"; + case 0xFEB07: + return "sign04"; + case 0xFEB08: + return "sign05"; + case 0xFEB0B: + return "sign01"; + case 0xFEB0C: + return "heart01"; + case 0xFEB0D: + return "heart02"; + case 0xFEB0E: + return "heart03"; + case 0xFEB0F: + return "heart04"; + case 0xFEB10: + return "heart01"; + case 0xFEB11: + return "heart02"; + case 0xFEB12: + return "heart01"; + case 0xFEB13: + return "heart01"; + case 0xFEB14: + return "heart01"; + case 0xFEB15: + return "heart01"; + case 0xFEB16: + return "heart01"; + case 0xFEB17: + return "heart01"; + case 0xFEB18: + return "heart02"; + case 0xFEB19: + return "cute"; + case 0xFEB1A: + return "heart"; + case 0xFEB1B: + return "spade"; + case 0xFEB1C: + return "diamond"; + case 0xFEB1D: + return "club"; + case 0xFEB1E: + return "smoking"; + case 0xFEB1F: + return "nosmoking"; + case 0xFEB20: + return "wheelchair"; + case 0xFEB21: + return "free"; + case 0xFEB22: + return "flag"; + case 0xFEB23: + return "danger"; + case 0xFEB26: + return "ng"; + case 0xFEB27: + return "ok"; + case 0xFEB28: + return "ng"; + case 0xFEB29: + return "copyright"; + case 0xFEB2A: + return "tm"; + case 0xFEB2B: + return "secret"; + case 0xFEB2C: + return "recycle"; + case 0xFEB2D: + return "r-mark"; + case 0xFEB2E: + return "ban"; + case 0xFEB2F: + return "empty"; + case 0xFEB30: + return "pass"; + case 0xFEB31: + return "full"; + case 0xFEB36: + return "new"; + case 0xFEB44: + return "fullmoon"; + case 0xFEB48: + return "ban"; + case 0xFEB55: + return "cute"; + case 0xFEB56: + return "flair"; + case 0xFEB57: + return "annoy"; + case 0xFEB58: + return "bomb"; + case 0xFEB59: + return "sleepy"; + case 0xFEB5A: + return "impact"; + case 0xFEB5B: + return "sweat01"; + case 0xFEB5C: + return "sweat02"; + case 0xFEB5D: + return "dash"; + case 0xFEB5F: + return "sad"; + case 0xFEB60: + return "shine"; + case 0xFEB61: + return "cute"; + case 0xFEB62: + return "cute"; + case 0xFEB63: + return "newmoon"; + case 0xFEB64: + return "newmoon"; + case 0xFEB65: + return "newmoon"; + case 0xFEB66: + return "newmoon"; + case 0xFEB67: + return "newmoon"; + case 0xFEB77: + return "shine"; + case 0xFEB81: + return "id"; + case 0xFEB82: + return "key"; + case 0xFEB83: + return "enter"; + case 0xFEB84: + return "clear"; + case 0xFEB85: + return "search"; + case 0xFEB86: + return "key"; + case 0xFEB87: + return "key"; + case 0xFEB8A: + return "key"; + case 0xFEB8D: + return "search"; + case 0xFEB90: + return "key"; + case 0xFEB91: + return "recycle"; + case 0xFEB92: + return "mail"; + case 0xFEB93: + return "rock"; + case 0xFEB94: + return "scissors"; + case 0xFEB95: + return "paper"; + case 0xFEB96: + return "punch"; + case 0xFEB97: + return "good"; + case 0xFEB9D: + return "paper"; + case 0xFEB9F: + return "ok"; + case 0xFEBA0: + return "down"; + case 0xFEBA1: + return "paper"; + case 0xFEE10: + return "info01"; + case 0xFEE11: + return "info02"; + case 0xFEE12: + return "by-d"; + case 0xFEE13: + return "d-point"; + case 0xFEE14: + return "appli01"; + case 0xFEE15: + return "appli02"; + case 0xFEE1C: + return "movie"; + default: + return null; } } diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java index 1f9a39ebc..45cdac72f 100644 --- a/src/com/fsck/k9/mail/store/WebDavStore.java +++ b/src/com/fsck/k9/mail/store/WebDavStore.java @@ -638,7 +638,7 @@ public class WebDavStore extends Store // an authentication header for basic authentication. info.requiredAuthType = AUTH_TYPE_BASIC; } - else if ((info.statusCode >= 200 && info.statusCode < 300) || // Success + else if ((info.statusCode >= 200 && info.statusCode < 300) || // Success (info.statusCode >= 300 && info.statusCode < 400) || // Redirect (info.statusCode == 440)) // Unauthorized diff --git a/src/com/fsck/k9/mail/transport/SmtpTransport.java b/src/com/fsck/k9/mail/transport/SmtpTransport.java index d7d30b38d..3d0bd276f 100644 --- a/src/com/fsck/k9/mail/transport/SmtpTransport.java +++ b/src/com/fsck/k9/mail/transport/SmtpTransport.java @@ -320,7 +320,7 @@ public class SmtpTransport extends Transport message.setRecipients(RecipientType.BCC, null); HashMap> charsetAddressesMap = - new HashMap>(); + new HashMap>(); for (Address address : addresses) { String addressString = address.getAddress(); @@ -335,7 +335,7 @@ public class SmtpTransport extends Transport } for (HashMap.Entry> charsetAddressesMapEntry : - charsetAddressesMap.entrySet()) + charsetAddressesMap.entrySet()) { String charset = charsetAddressesMapEntry.getKey(); ArrayList addressesOfCharset = charsetAddressesMapEntry.getValue(); @@ -345,7 +345,8 @@ public class SmtpTransport extends Transport } private void sendMessageTo(ArrayList addresses, Message message) - throws MessagingException{ + throws MessagingException + { close(); open(); diff --git a/src/com/fsck/k9/service/MailService.java b/src/com/fsck/k9/service/MailService.java index f97d3b69f..fd291bcac 100644 --- a/src/com/fsck/k9/service/MailService.java +++ b/src/com/fsck/k9/service/MailService.java @@ -434,7 +434,7 @@ public class MailService extends CoreService long lastRefresh = pusher.getLastRefresh(); int refreshInterval = pusher.getRefreshInterval(); long sinceLast = nowTime - lastRefresh; - if (sinceLast + 10000 > refreshInterval) // Add 10 seconds to keep pushers in sync, avoid drift + if (sinceLast + 10000 > refreshInterval) // Add 10 seconds to keep pushers in sync, avoid drift { if (K9.DEBUG) { diff --git a/src/com/fsck/k9/view/ColorChip.java b/src/com/fsck/k9/view/ColorChip.java index 0383e63d0..a71f394ea 100644 --- a/src/com/fsck/k9/view/ColorChip.java +++ b/src/com/fsck/k9/view/ColorChip.java @@ -4,7 +4,8 @@ import android.graphics.Path; import android.graphics.drawable.ShapeDrawable; import android.graphics.drawable.shapes.PathShape; -public class ColorChip { +public class ColorChip +{ private static final Path CHIP_PATH = new Path(); static @@ -22,15 +23,17 @@ public class ColorChip { private ShapeDrawable mDrawable; - public ColorChip(int color) { - - mDrawable = new ShapeDrawable(new PathShape(CHIP_PATH, 10, 10)); - mDrawable.getPaint().setColor(color); + public ColorChip(int color) + { + + mDrawable = new ShapeDrawable(new PathShape(CHIP_PATH, 10, 10)); + mDrawable.getPaint().setColor(color); } - - public ShapeDrawable drawable () { + + public ShapeDrawable drawable () + { return mDrawable; } diff --git a/src/com/fsck/k9/view/MessageWebView.java b/src/com/fsck/k9/view/MessageWebView.java index be7536084..dd8f6afb3 100644 --- a/src/com/fsck/k9/view/MessageWebView.java +++ b/src/com/fsck/k9/view/MessageWebView.java @@ -20,7 +20,8 @@ import java.lang.reflect.Method; * Time: 3:57 PM * To change this template use File | Settings | File Templates. */ -public class MessageWebView extends WebView { +public class MessageWebView extends WebView +{ /** * We use WebSettings.getBlockNetworkLoads() to prevent the WebView that displays email