sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update ice4j.jar and fix some javadoc warnings.

Browse Source
cusax-fix
Sebastien Vincent 15 years ago
parent 92b9bfd09b
commit 665318ecb9
7 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File

BIN
lib/installer-exclude/ice4j.jar
View File

Binary file not shown.

3
src/net/java/sip/communicator/impl/callhistory/CallRecordImpl.java
Unescape View File

@ -18,6 +18,9 @@
public class CallRecordImpl
extends CallRecord
{
/**
* The <tt>Call</tt> source of this record.
*/
private Call sourceCall = null;
/**

17
src/net/java/sip/communicator/impl/certificate/CertificateVerificationServiceImpl.java
Unescape View File

@ -195,7 +195,7 @@ public X509TrustManager getTrustManager(String toHost, int toPort)
TrustManagerFactory.getInstance(
KeyManagerFactory.getDefaultAlgorithm());
tmFactory.init((KeyStore)null);
return new HostTrustManager(
(X509TrustManager)tmFactory.getTrustManagers()[0],
toHost, toPort);
@ -290,6 +290,11 @@ private KeyStore getKeyStore()
private static class VerifyCertificateDialog
extends SIPCommDialog
{
/**
* Serial version UID.
*/
private static final long serialVersionUID = 0L;
/**
* Date formatter.
*/
@ -449,7 +454,7 @@ public void actionPerformed(ActionEvent e)
actionShowCertificate();
}
});
TransparentPanel firstButonPanel =
TransparentPanel firstButonPanel =
new TransparentPanel(new FlowLayout(FlowLayout.LEFT));
firstButonPanel.add(certButton);
southPanel.add(firstButonPanel, BorderLayout.WEST);
@ -622,7 +627,7 @@ private static Component getX509DisplayComponent(
certDisplayPanel.add(
new JLabel(getCertificateValue(subject.getName(), "CN")),
constraints);
constraints.gridy = currentRow++;
constraints.gridx = 0;
certDisplayPanel.add(new JLabel(
@ -757,7 +762,7 @@ private static Component getX509DisplayComponent(
constraints.gridx = 0;
certDisplayPanel.add(new JLabel("SHA1:"),
constraints);
constraints.gridx = 1;
certDisplayPanel.add(
sha1Area,
@ -784,7 +789,6 @@ private static Component getX509DisplayComponent(
// do nothing as we cannot show this value
logger.warn("Error in certificate, cannot show fingerprints", e);
}
constraints.gridy = currentRow++;
constraints.gridx = 0;
@ -1039,7 +1043,8 @@ public X509Certificate[] getAcceptedIssuers()
* Not used.
* @param chain the cert chain.
* @param authType authentication type like: RSA.
* @throws CertificateException
* @throws CertificateException if something went wrong with
* certificate verification
*/
public void checkClientTrusted(X509Certificate[] chain, String authType)
throws CertificateException

2
src/net/java/sip/communicator/impl/neomedia/RTPConnectorImpl.java
Unescape View File

@ -102,7 +102,7 @@ public void addTarget(SessionAddress target)
*/
public void close()
{
if (dataOutputStream != null)
if (dataOutputStream != null)
{
dataOutputStream.close();
dataOutputStream = null;

7
src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java
Unescape View File

@ -390,6 +390,7 @@ public void sendTransportInfo(
getPeer().sendTransportInfo(contents);
}
});
/*
* While it may sound like we can completely eliminate the post-pickup
* delay by waiting for the connectivity establishment to finish, it may
@ -1166,7 +1167,11 @@ private MediaDirection calculatePostHoldDirection(MediaStream stream)
* peer to the remote peer. If <tt>remote</tt> is <tt>null</tt>,
* <tt>local</tt> represents an offer from the local peer to be sent to the
* remote peer
* @param transportInfoSender
* @param transportInfoSender the <tt>TransportInfoSender</tt> to be used by
* this <tt>TransportManagerJabberImpl</tt> to send <tt>transport-info</tt>
* <tt>JingleIQ</tt>s from the local peer to the remote peer if this
* <tt>TransportManagerJabberImpl</tt> wishes to utilize
* <tt>transport-info</tt>
* @return the media descriptions of the local peer after the local
* candidate addresses have been gathered as returned by
* {@link TransportManagerJabberImpl#wrapupCandidateHarvest()}

12
src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java
Unescape View File

@ -356,8 +356,9 @@ public String getXmlNamespace()
* Starts transport candidate harvest. This method should complete rapidly
* and, in case of lengthy procedures like STUN/TURN/UPnP candidate harvests
* are necessary, they should be executed in a separate thread. Candidate
* harvest would then need to be concluded in the {@link #wrapupHarvest()}
* method which would be called once we absolutely need the candidates.
* harvest would then need to be concluded in the
* {@link #wrapupCandidateHarvest()} method which would be called once we
* absolutely need the candidates.
*
* @param theirOffer a media description offer that we've received from the
* remote party and that we should use in case we need to know what
@ -451,8 +452,9 @@ public void startCandidateHarvest(
* Starts transport candidate harvest. This method should complete rapidly
* and, in case of lengthy procedures like STUN/TURN/UPnP candidate harvests
* are necessary, they should be executed in a separate thread. Candidate
* harvest would then need to be concluded in the {@link #wrapupHarvest()}
* method which would be called once we absolutely need the candidates.
* harvest would then need to be concluded in the
* {@link #wrapupCandidateHarvest()} method which would be called once we
* absolutely need the candidates.
*
* @param ourOffer the content list that should tell us how many stream
* connectors we actually need.
@ -628,7 +630,7 @@ public boolean startConnectivityEstablishment(
/*
* Is the remote candidate from the current generation of the
* iceAgent?
*/
*/
if (candidate.getGeneration() != generation)
continue;

10
src/net/java/sip/communicator/impl/protocol/jabber/TransportManagerJabberImpl.java
Unescape View File

@ -128,8 +128,9 @@ protected void incrementGeneration()
* Starts transport candidate harvest. This method should complete rapidly
* and, in case of lengthy procedures like STUN/TURN/UPnP candidate harvests
* are necessary, they should be executed in a separate thread. Candidate
* harvest would then need to be concluded in the {@link #wrapupHarvest()}
* method which would be called once we absolutely need the candidates.
* harvest would then need to be concluded in the
* {@link #wrapupCandidateHarvest()} method which would be called once we
* absolutely need the candidates.
*
* @param theirOffer a media description offer that we've received from the
* remote party and that we should use in case we need to know what
@ -157,8 +158,9 @@ public abstract void startCandidateHarvest(
* Starts transport candidate harvest. This method should complete rapidly
* and, in case of lengthy procedures like STUN/TURN/UPnP candidate harvests
* are necessary, they should be executed in a separate thread. Candidate
* harvest would then need to be concluded in the {@link #wrapupHarvest()}
* method which would be called once we absolutely need the candidates.
* harvest would then need to be concluded in the
* {@link #wrapupCandidateHarvest()} method which would be called once we
* absolutely need the candidates.
*
* @param ourOffer the content descriptions that we should be adding our
* transport lists to (although not necessarily in this very instance).

Write Preview
Loading…
Cancel
Save