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

do not crash on jingle connection when contact doesn't use disco

Browse source
This commit is contained in:
Daniel Gultsch 2016-07-04 19:29:46 +02:00
parent 369e7172d6
commit ac8aa63916
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View file

@ -22,6 +22,7 @@ import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.DownloadableFile; import eu.siacs.conversations.entities.DownloadableFile;
import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.entities.Presence; import eu.siacs.conversations.entities.Presence;
import eu.siacs.conversations.entities.ServiceDiscoveryResult;
import eu.siacs.conversations.entities.Transferable; import eu.siacs.conversations.entities.Transferable;
import eu.siacs.conversations.entities.TransferablePlaceholder; import eu.siacs.conversations.entities.TransferablePlaceholder;
import eu.siacs.conversations.persistance.FileBackend; import eu.siacs.conversations.persistance.FileBackend;
@ -297,8 +298,9 @@ public class JingleConnection implements Transferable {
String resource = jid != null ?jid.getResourcepart() : null; String resource = jid != null ?jid.getResourcepart() : null;
if (resource != null) { if (resource != null) {
Presence presence = this.account.getRoster().getContact(jid).getPresences().getPresences().get(resource); Presence presence = this.account.getRoster().getContact(jid).getPresences().getPresences().get(resource);
if (presence != null) { ServiceDiscoveryResult result = presence != null ? presence.getServiceDiscoveryResult() : null;
List<String> features = presence.getServiceDiscoveryResult().getFeatures(); if (result != null) {
List<String> features = result.getFeatures();
if (features.contains(Content.Version.FT_4.getNamespace())) { if (features.contains(Content.Version.FT_4.getNamespace())) {
this.ftVersion = Content.Version.FT_4; this.ftVersion = Content.Version.FT_4;
} }