narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed possible npe when loading null counterpart into message

Browse source
This commit is contained in:
iNPUTmice 2014-11-14 19:49:44 +01:00
parent 2db569b20f
commit 3118340ade
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/entities/Message.java
View file

@ -96,7 +96,12 @@ public class Message extends AbstractEntity {
public static Message fromCursor(Cursor cursor) { public static Message fromCursor(Cursor cursor) {
Jid jid; Jid jid;
try { try {
jid = Jid.fromString(cursor.getString(cursor.getColumnIndex(COUNTERPART))); String value = cursor.getString(cursor.getColumnIndex(COUNTERPART));
if (value!=null) {
jid = Jid.fromString(value);
} else {
jid = null;
}
} catch (InvalidJidException e) { } catch (InvalidJidException e) {
jid = null; jid = null;
} }