vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 17:19:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '4.2'

Browse source
This commit is contained in:
Florian Schmaus 2017-12-25 11:40:45 +01:00
commit 0eeab74990
55 changed files with 385 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java
View file

@ -332,6 +332,8 @@ public final class CarbonManager extends Manager {
/**
* Check if carbons are enabled on this connection.
*
* @return true if carbons are enabled, else false.
*/
public boolean getCarbonsEnabled() {
return this.enabled_state;

1
smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java
View file

@ -56,6 +56,7 @@ public abstract class AbstractHttpOverXmpp extends IQ {
/**
* Returns start tag.
*
* @param xml builder.
* @return start tag
*/
protected abstract IQChildElementXmlStringBuilder getIQHoxtChildElementBuilder(IQChildElementXmlStringBuilder xml);