1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-12-14 09:01:08 +01:00

Merge branch '4.1'

Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle
This commit is contained in:
Florian Schmaus 2015-03-24 17:16:18 +01:00
commit 83b84c5bd3
168 changed files with 780 additions and 687 deletions

View file

@ -60,7 +60,7 @@ import org.jxmpp.jid.Jid;
* <p/>
*
* For example to get the idle time of a user logged in a resource, simple send
* the LastActivity packet to them, as in the following code:
* the LastActivity stanza(/packet) to them, as in the following code:
* <p>
*
* <pre>
@ -76,7 +76,7 @@ import org.jxmpp.jid.Jid;
* LastActivity activity = LastActivity.getLastActivity(con, &quot;xray@jabber.org&quot;);
* </pre>
*
* To get the uptime of a host, you simple send the LastActivity packet to it,
* To get the uptime of a host, you simple send the LastActivity stanza(/packet) to it,
* as in the following code example:
* <p>
*
@ -228,7 +228,7 @@ public class LastActivityManager extends Manager {
*
* @param jid
* the JID of the user.
* @return the LastActivity packet of the jid.
* @return the LastActivity stanza(/packet) of the jid.
* @throws XMPPErrorException
* thrown if a server error has occured.
* @throws NoResponseException if there was no response from the server.