From ccdc91a4974dee9aa98c2a11906aaf6d97e24056 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 14 Jun 2020 09:01:47 +0200 Subject: [PATCH] remove check that would ensure you use jingle only with full jids --- .../xmpp/jingle/AbstractJingleConnection.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java index 679a30abe..bd50a22a2 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java @@ -16,10 +16,10 @@ public abstract class AbstractJingleConnection { public static final String JINGLE_MESSAGE_PROPOSE_ID_PREFIX = "jm-propose-"; public static final String JINGLE_MESSAGE_PROCEED_ID_PREFIX = "jm-proceed-"; - protected final JingleConnectionManager jingleConnectionManager; + final JingleConnectionManager jingleConnectionManager; protected final XmppConnectionService xmppConnectionService; protected final Id id; - protected final Jid initiator; + private final Jid initiator; AbstractJingleConnection(final JingleConnectionManager jingleConnectionManager, final Id id, final Jid initiator) { this.jingleConnectionManager = jingleConnectionManager; @@ -47,8 +47,9 @@ public abstract class AbstractJingleConnection { public final String sessionId; private Id(final Account account, final Jid with, final String sessionId) { + Preconditions.checkNotNull(account); Preconditions.checkNotNull(with); - Preconditions.checkArgument(with.isFullJid()); + Preconditions.checkNotNull(sessionId); this.account = account; this.with = with; this.sessionId = sessionId;