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

Merge branch '4.0'

Browse source 
Conflicts:
	build.gradle
This commit is contained in:
Florian Schmaus 2014-08-19 11:32:57 +02:00
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. // Indicate that we're now authenticated.
authenticated = true; authenticated = true;
anonymous = false; anonymous = false;
@ -296,6 +291,14 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
debugger.userHasLogged(user); debugger.userHasLogged(user);
} }
callConnectionAuthenticatedListener(); 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 { 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; authenticated = true;
anonymous = false; anonymous = false;
// Set presence to online.
if (config.isSendPresence()) {
sendPacket(new Presence(Presence.Type.available));
}
// Stores the authentication for future reconnection // Stores the authentication for future reconnection
setLoginInfo(username, password, resource); setLoginInfo(username, password, resource);
@ -310,6 +305,14 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
debugger.userHasLogged(user); debugger.userHasLogged(user);
} }
callConnectionAuthenticatedListener(); 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 @Override