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-09-29 14:00:48 +02:00
parent 6c892fec96 039fac7ab7
commit 50e068b6a7
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -326,4 +326,4 @@ def getAndroidJavadocOffline() {
def androidHome = new File("$System.env.ANDROID_HOME")
if (!androidHome.isDirectory()) throw new Exception("ANDROID_HOME not found or set")
return "$System.env.ANDROID_HOME" + "/docs/reference"
}
}

17
resources/releasedocs/changelog.html
View File

@ -141,6 +141,23 @@ hr {
<div id="pageBody">
<h2>4.0.4 -- <span style="font-weight: normal;">2014-09-05</span></h2>
<h2> Bug
</h2>
<ul>
<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-596'>SMACK-596</a>] - Smack should load roster before sending the initial presence
</li>
<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-598'>SMACK-598</a>] - Smack should allow the empty string as content of message body element
</li>
<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-601'>SMACK-601</a>] - PubSub ItemProvider does only process the outermost namespace definition when creating PayloadItems
</li>
<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-602'>SMACK-602</a>] - PacketCollector must handle InterruptException
</li>
<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-603'>SMACK-603</a>] - XMPPError.Condition.equals() should be null-safe
</li>
</ul>
<h2>4.0.3 -- <span style="font-weight: normal;">2014-08-16</span></h2>
<h2> Bug

4
smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
View File

@ -171,7 +171,7 @@ public class PingManager extends Manager {
* by the entity.
*
* @param jid The id of the entity the ping is being sent to
* @param pingTimeout The time to wait for a reply
* @param pingTimeout The time to wait for a reply in milliseconds
* @return true if a reply was received from the entity, false otherwise.
* @throws NoResponseException if there was no response from the jid.
* @throws NotConnectedException
@ -179,7 +179,7 @@ public class PingManager extends Manager {
public boolean ping(String jid, long pingTimeout) throws NotConnectedException, NoResponseException {
Ping ping = new Ping(jid);
try {
connection().createPacketCollectorAndSend(ping).nextResultOrThrow();
connection().createPacketCollectorAndSend(ping).nextResultOrThrow(pingTimeout);
}
catch (XMPPException exc) {
return jid.equals(connection().getServiceName());