vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-14 16:22:07 +01:00
Code Issues Releases Wiki Activity

Fix NPE if MUC occupants cannot be retrieved

Browse source
This commit is contained in:
Paul Schaub 2018-01-31 15:46:37 +01:00
parent 15083fa3b0
commit 7a4977181f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
View file

@ -1187,10 +1187,14 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
MultiUserChat muc = getMuc(manager.getConnection(), stanza.getFrom()); MultiUserChat muc = getMuc(manager.getConnection(), stanza.getFrom());
if (muc != null) { if (muc != null) {
Occupant occupant = muc.getOccupant(stanza.getFrom().asEntityFullJidIfPossible()); Occupant occupant = muc.getOccupant(stanza.getFrom().asEntityFullJidIfPossible());
if (occupant == null) {
LOGGER.log(Level.WARNING, "Cannot decrypt OMEMO MUC message; MUC Occupant is null.");
return;
}
Jid occupantJid = occupant.getJid(); Jid occupantJid = occupant.getJid();
if (occupantJid == null) { if (occupantJid == null) {
LOGGER.log(Level.WARNING, "MUC message received, but there is no way to retrieve the senders Jid. " + LOGGER.log(Level.WARNING, "Cannot decrypt OMEMO MUC message; Senders Jid is null. " +
stanza.getFrom()); stanza.getFrom());
return; return;
} }