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

Merge branch '4.0' 

Conflicts:
	build.gradle
This commit is contained in:
Florian Schmaus 2014-08-19 11:32:57 +02:00
parent a49eac7c00 9eb5c2a49d
commit 24f7de8d54
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
View File

@ -277,11 +277,6 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
}
}
// Set presence to online.
if (config.isSendPresence()) {
sendPacket(new Presence(Presence.Type.available));
}
// Indicate that we're now authenticated.
authenticated = true;
anonymous = false;
@ -296,6 +291,14 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
debugger.userHasLogged(user);
}
callConnectionAuthenticatedListener();
// Set presence to online. It is important that this is done after
// callConnectionAuthenticatedListener(), as this call will also
// eventually load the roster. And we should load the roster before we
// send the initial presence.
if (config.isSendPresence()) {
sendPacket(new Presence(Presence.Type.available));
}
}
public void loginAnonymously() throws XMPPException, SmackException, IOException {

13
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
View File

@ -294,11 +294,6 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
authenticated = true;
anonymous = false;
// Set presence to online.
if (config.isSendPresence()) {
sendPacket(new Presence(Presence.Type.available));
}
// Stores the authentication for future reconnection
setLoginInfo(username, password, resource);
@ -310,6 +305,14 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
debugger.userHasLogged(user);
}
callConnectionAuthenticatedListener();
// Set presence to online. It is important that this is done after
// callConnectionAuthenticatedListener(), as this call will also
// eventually load the roster. And we should load the roster before we
// send the initial presence.
if (config.isSendPresence()) {
sendPacket(new Presence(Presence.Type.available));
}
}
@Override