TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 23:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2341 from mcginty/mms-recv-null-text

Browse Source 
don't fail on null received text parts
This commit is contained in:
Moxie Marlinspike 2015-01-13 12:35:22 -08:00
commit 9a31c5961a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/mms/PartParser.java
View File

@ -24,7 +24,11 @@ public class PartParser {
if (characterSet.equals(CharacterSets.MIMENAME_ANY_CHARSET)) if (characterSet.equals(CharacterSets.MIMENAME_ANY_CHARSET))
characterSet = CharacterSets.MIMENAME_ISO_8859_1; characterSet = CharacterSets.MIMENAME_ISO_8859_1;
partText = new String(body.getPart(i).getData(), characterSet); if (body.getPart(i).getData() != null) {
partText = new String(body.getPart(i).getData(), characterSet);
} else {
partText = "";
}
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
Log.w("PartParser", e); Log.w("PartParser", e);
partText = "Unsupported Encoding!"; partText = "Unsupported Encoding!";