Fix to make emoji work in push groups.

This commit is contained in:
Moxie Marlinspike 2014-02-24 17:01:28 -08:00
parent 43c1576aab
commit 52ff4ecfd2

View File

@ -79,8 +79,8 @@ public class TextSlide extends Slide {
PduPart part = new PduPart(); PduPart part = new PduPart();
try { try {
part.setData(message.getBytes(CharacterSets.MIMENAME_ISO_8859_1)); part.setData(message.getBytes(CharacterSets.MIMENAME_UTF_8));
if (part.getData().length == 0) if (part.getData().length == 0)
throw new AssertionError("Part data should not be zero!"); throw new AssertionError("Part data should not be zero!");
@ -88,8 +88,8 @@ public class TextSlide extends Slide {
Log.w("TextSlide", "ISO_8859_1 must be supported!", e); Log.w("TextSlide", "ISO_8859_1 must be supported!", e);
part.setData("Unsupported character set!".getBytes()); part.setData("Unsupported character set!".getBytes());
} }
part.setCharset(CharacterSets.ISO_8859_1); part.setCharset(CharacterSets.UTF_8);
part.setContentType(ContentType.TEXT_PLAIN.getBytes()); part.setContentType(ContentType.TEXT_PLAIN.getBytes());
part.setContentId((System.currentTimeMillis()+"").getBytes()); part.setContentId((System.currentTimeMillis()+"").getBytes());
part.setName(("Text"+System.currentTimeMillis()).getBytes()); part.setName(("Text"+System.currentTimeMillis()).getBytes());