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

Merge branch '4.1'

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
View file

@ -78,7 +78,7 @@ public class PrivateDataManager extends Manager {
/**
* Returns the private data provider registered to the specified XML element name and namespace.
* For example, if a provider was registered to the element name "prefs" and the
* namespace "http://www.xmppclient.com/prefs", then the following packet would trigger
* namespace "http://www.xmppclient.com/prefs", then the following stanza(/packet) would trigger
* the provider:
*
* <pre>

4
smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java
View file

@ -64,7 +64,7 @@ public class DefaultPrivateData implements PrivateData {
/**
* Returns the XML element name of the private data sub-packet root element.
*
* @return the XML element name of the packet extension.
* @return the XML element name of the stanza(/packet) extension.
*/
public String getElementName() {
return elementName;
@ -73,7 +73,7 @@ public class DefaultPrivateData implements PrivateData {
/**
* Returns the XML namespace of the private data sub-packet root element.
*
* @return the XML namespace of the packet extension.
* @return the XML namespace of the stanza(/packet) extension.
*/
public String getNamespace() {
return namespace;