diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-05-16 21:45:29 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-05-16 21:45:29 +0200 |
| commit | f8ec77ab9689193e366eb3aed51cb17d1ccbd986 (patch) | |
| tree | 6c95907b7c1ccd27d6d18461dfc7ad7357fe89aa /src/main/java/de/pixart/messenger/entities/Conversation.java | |
| parent | 0525b1f960f4d7b45940bfe4a88beac99e571363 (diff) | |
do not load conversations with null jid
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index 3aaa89529..98a847b09 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -29,6 +29,7 @@ import de.pixart.messenger.Config; import de.pixart.messenger.crypto.OmemoSetting; import de.pixart.messenger.crypto.PgpDecryptionService; import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.utils.JidHelper; import de.pixart.messenger.xmpp.chatstate.ChatState; import de.pixart.messenger.xmpp.mam.MamReference; import rocks.xmpp.addr.Jid; @@ -115,18 +116,11 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl } public static Conversation fromCursor(Cursor cursor) { - Jid jid; - try { - jid = Jid.of(cursor.getString(cursor.getColumnIndex(CONTACTJID))); - } catch (final IllegalArgumentException e) { - // Borked DB.. - jid = null; - } return new Conversation(cursor.getString(cursor.getColumnIndex(UUID)), cursor.getString(cursor.getColumnIndex(NAME)), cursor.getString(cursor.getColumnIndex(CONTACT)), cursor.getString(cursor.getColumnIndex(ACCOUNT)), - jid, + JidHelper.parseOrFallbackToInvalid(cursor.getString(cursor.getColumnIndex(CONTACTJID))), cursor.getLong(cursor.getColumnIndex(CREATED)), cursor.getInt(cursor.getColumnIndex(STATUS)), cursor.getInt(cursor.getColumnIndex(MODE)), |