vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-12-12 05:51: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

8
smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java
View file

@ -28,7 +28,7 @@ public class JivePropertiesManager {
private static boolean javaObjectEnabled = false;
/**
* Enables deserialization of Java objects embedded in the 'properties' packet extension. Since
* Enables deserialization of Java objects embedded in the 'properties' stanza(/packet) extension. Since
* this is a security sensitive feature, it is disabled per default in Smack. Only enable it if
* you are sure that you understand the potential security implications it can cause.
* <p>
@ -49,7 +49,7 @@ public class JivePropertiesManager {
/**
* Convenience method to add a property to a packet.
*
* @param packet the packet to add the property to.
* @param packet the stanza(/packet) to add the property to.
* @param name the name of the property to add.
* @param value the value of the property to add.
*/
@ -63,7 +63,7 @@ public class JivePropertiesManager {
}
/**
* Convenience method to get a property from a packet. Will return null if the packet contains
* Convenience method to get a property from a packet. Will return null if the stanza(/packet) contains
* not property with the given name.
*
* @param packet
@ -95,7 +95,7 @@ public class JivePropertiesManager {
}
/**
* Return a map of all properties of the given packet. If the packet contains no properties
* Return a map of all properties of the given packet. If the stanza(/packet) contains no properties
* extension, an empty map will be returned.
*
* @param packet

4
smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java
View file

@ -40,7 +40,7 @@ import org.jivesoftware.smack.util.stringencoder.Base64;
*/
public class JivePropertiesExtension implements ExtensionElement {
/**
* Namespace used to store packet properties.
* Namespace used to store stanza(/packet) properties.
*/
public static final String NAMESPACE = "http://www.jivesoftware.com/xmlns/xmpp/properties";
@ -59,7 +59,7 @@ public class JivePropertiesExtension implements ExtensionElement {
}
/**
* Returns the packet property with the specified name or <tt>null</tt> if the
* Returns the stanza(/packet) property with the specified name or <tt>null</tt> if the
* property doesn't exist. Property values that were originally primitives will
* be returned as their object equivalent. For example, an int property will be
* returned as an Integer, a double as a Double, etc.

2
smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
View file

@ -39,7 +39,7 @@ public class JivePropertiesExtensionProvider extends ExtensionElementProvider<Ji
* Parse a properties sub-packet. If any errors occur while de-serializing Java object
* properties, an exception will be printed and not thrown since a thrown exception will shut
* down the entire connection. ClassCastExceptions will occur when both the sender and receiver
* of the packet don't have identical versions of the same class.
* of the stanza(/packet) don't have identical versions of the same class.
* <p>
* Note that you have to explicitly enabled Java object deserialization with @{link
* {@link JivePropertiesManager#setJavaObjectEnabled(boolean)}