Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-29 09:42:06 +01:00
Code Issues Releases Wiki Activity

Fix AbstractXMPPConnection.login() javadoc

Browse source 
non-SASL auth is no longer supported by Smack.
This commit is contained in:
Florian Schmaus 2015-01-18 21:02:06 +01:00
parent cb67f1d5c3
commit 672d131280
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
View file

@ -370,15 +370,15 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
private String usedUsername, usedPassword, usedResource; private String usedUsername, usedPassword, usedResource;
/** /**
* Logs in to the server using the strongest authentication mode supported by * Logs in to the server using the strongest SASL mechanism supported by
* the server, then sets presence to available. If the server supports SASL authentication * the server. If more than the connection's default packet timeout elapses in each step of the
* then the user will be authenticated using SASL if not Non-SASL authentication will * authentication process without a response from the server, a
* be tried. If more than five seconds (default timeout) elapses in each step of the * {@link SmackException.NoResponseException} will be thrown.
* authentication process without a response from the server, or if an error occurs, a * <p>
* XMPPException will be thrown.<p> * Before logging in (i.e. authenticate) to the server the connection must be connected
* * by calling {@link #connect}.
* Before logging in (i.e. authenticate) to the server the connection must be connected. * </p>
* * <p>
* It is possible to log in without sending an initial available presence by using * It is possible to log in without sending an initial available presence by using
* {@link ConnectionConfiguration.Builder#setSendPresence(boolean)}. If this connection is * {@link ConnectionConfiguration.Builder#setSendPresence(boolean)}. If this connection is
* not interested in loading its roster upon login then use * not interested in loading its roster upon login then use
@ -387,10 +387,11 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
* while using SASL then you may be interested in using * while using SASL then you may be interested in using
* {@link ConnectionConfiguration.Builder#setCallbackHandler(javax.security.auth.callback.CallbackHandler)}. * {@link ConnectionConfiguration.Builder#setCallbackHandler(javax.security.auth.callback.CallbackHandler)}.
* For more advanced login settings see {@link ConnectionConfiguration}. * For more advanced login settings see {@link ConnectionConfiguration}.
* </p>
* *
* @throws XMPPException if an error occurs on the XMPP protocol level. * @throws XMPPException if an error occurs on the XMPP protocol level.
* @throws SmackException if an error occurs somehwere else besides XMPP protocol level. * @throws SmackException if an error occurs somewhere else besides XMPP protocol level.
* @throws IOException * @throws IOException if an I/O error occurs during login.
*/ */
public synchronized void login() throws XMPPException, SmackException, IOException { public synchronized void login() throws XMPPException, SmackException, IOException {
if (isAnonymous()) { if (isAnonymous()) {