diff options
| author | Sebastien Vincent <seb@jitsi.org> | 2010-12-15 17:00:24 +0000 |
|---|---|---|
| committer | Sebastien Vincent <seb@jitsi.org> | 2010-12-15 17:00:24 +0000 |
| commit | 27bee30679e74ca19469e33ac740696f090fa53f (patch) | |
| tree | 3940587a0de0d1d02c5ba188510080a1100499ed | |
| parent | ea75bc38c27049dcaa9bbd602b8e60b3249377de (diff) | |
| download | jitsi-27bee30679e74ca19469e33ac740696f090fa53f.zip jitsi-27bee30679e74ca19469e33ac740696f090fa53f.tar.gz jitsi-27bee30679e74ca19469e33ac740696f090fa53f.tar.bz2 | |
Wait ICE connectivity checks to be finished before generate the session-accept message.
3 files changed, 11 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/SelectScreenDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/SelectScreenDialog.java index 401335a..3951e15 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/SelectScreenDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/SelectScreenDialog.java @@ -31,6 +31,11 @@ public class SelectScreenDialog extends SIPCommDialog { /** + * Serial version UID. + */ + private static final long serialVersionUID = 0L; + + /** * The object used for logging. */ private final static Logger logger diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java index b46c630..b67c341 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java @@ -310,6 +310,8 @@ public class CallPeerJabberImpl try { + getMediaHandler().getTransportManager(). + wrapupConnectivityEstablishment(); answer = getMediaHandler().generateSessionAccept(); } catch(Exception exc) diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java index 0844ee9..ce2660c 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java @@ -475,7 +475,10 @@ public class OperationSetBasicTelephonyJabberImpl */ private void unsubscribeForJinglePackets() { - protocolProvider.getConnection().removePacketListener(this); + if(protocolProvider.getConnection() != null) + { + protocolProvider.getConnection().removePacketListener(this); + } } /** |