Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-12-05 12:41:08 +01:00
Code Issues Releases Wiki Activity

Merge branch '4.0'

Browse source 
Conflicts:
	build.gradle
	documentation/connections.html
	documentation/gettingstarted.html
	smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
	smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
	smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
	smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
This commit is contained in:
Florian Schmaus 2014-07-05 14:37:22 +02:00
commit 94a16ba41e
61 changed files with 806 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java
View file

@ -24,7 +24,7 @@ import org.jivesoftware.smack.test.SmackTestCase;
import org.jivesoftware.smackx.packet.Version;
/**
* Ensure that stream compression (JEP-138) is correctly supported by Smack.
* Ensure that stream compression (XEP-138) is correctly supported by Smack.
*
* @author Gaston Dombiak
*/

2
smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java
View file

@ -30,7 +30,7 @@ import java.util.Arrays;
import java.util.List;
/**
* Tests that JEP-33 support in Smack is correct.
* Tests that XEP-33 support in Smack is correct.
*
* @author Gaston Dombiak
*/

4
smack-extensions/src/integration-test/java/org/jivesoftware/smackx/OfflineMessageManagerTest.java
View file

@ -32,7 +32,7 @@ import java.util.List;
/**
* Tests handling of offline messaging using OfflineMessageManager. This server requires the
* server to support JEP-0013: Flexible Offline Message Retrieval.
* server to support XEP-0013: Flexible Offline Message Retrieval.
*
* @author Gaston Dombiak
*/
@ -44,7 +44,7 @@ public class OfflineMessageManagerTest extends SmackTestCase {
public void testDiscoverFlexibleRetrievalSupport() throws XMPPException {
OfflineMessageManager offlineManager = new OfflineMessageManager(getConnection(1));
assertTrue("Server does not support JEP-13", offlineManager.supportsFlexibleRetrieval());
assertTrue("Server does not support XEP-13", offlineManager.supportsFlexibleRetrieval());
}
/**