vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 20:12:07 +01:00
Code Issues Releases Wiki Activity

Merge Smack 4.1.0-rc3

Browse source 
Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	version.gradle
This commit is contained in:
Florian Schmaus 2015-03-07 21:31:35 +01:00
commit c540ac9703
17 changed files with 71 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
maven { url 'http://dl.bintray.com/content/aalmiray/kordamp' } maven { url 'http://dl.bintray.com/content/aalmiray/kordamp' }
} }
dependencies { dependencies {
classpath 'org.kordamp:markdown-gradle-plugin:0.1.1' classpath 'org.kordamp:markdown-gradle-plugin:1.0.0'
classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.1.0' classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.1.0'
} }
} }

1
documentation/README.md Symbolic link
View file

@ -0,0 +1 @@
index.md

2
documentation/connections.md
View file

@ -1,7 +1,7 @@
Smack: XMPPConnection Management Smack: XMPPConnection Management
================================ ================================
[Back](index.html) [Back](index.md)
Creating a Connection Creating a Connection
--------------------- ---------------------

2
documentation/debugging.md
View file

@ -1,7 +1,7 @@
Debugging with Smack Debugging with Smack
==================== ====================
[Back](index.html) [Back](index.md)
Smack includes two built-in debugging consoles that will let you track Smack includes two built-in debugging consoles that will let you track
all XML traffic between the client and server. A lite debugger and an all XML traffic between the client and server. A lite debugger and an

32
documentation/extensions/index.md
View file

@ -14,7 +14,7 @@ Currently supported XEPs of smack-tcp
| Name | XEP | Description | | Name | XEP | Description |
|---------------------------------------------|----------------------------------------------------------|----------------------------------------------------------------------------------------------------------| |---------------------------------------------|----------------------------------------------------------|----------------------------------------------------------------------------------------------------------|
| [Stream Management](streammanagement.html) | [XEP-0198](http://xmpp.org/extensions/xep-0198.html) | Allows active management of an XML Stream between two XMPP entities (stanza acknowledgement, stream resumption). | | [Stream Management](streammanagement.md) | [XEP-0198](http://xmpp.org/extensions/xep-0198.html) | Allows active management of an XML Stream between two XMPP entities (stanza acknowledgement, stream resumption). |
Smack Extensions and currently supported XEPs by Smack (smack-extensions) Smack Extensions and currently supported XEPs by Smack (smack-extensions)
@ -22,32 +22,32 @@ Smack Extensions and currently supported XEPs by Smack (smack-extensions)
| Name | XEP | Description | | Name | XEP | Description |
|---------------------------------------------|----------------------------------------------------------|----------------------------------------------------------------------------------------------------------| |---------------------------------------------|----------------------------------------------------------|----------------------------------------------------------------------------------------------------------|
| [Data Forms](dataforms.html) | [XEP-0004](http://xmpp.org/extensions/xep-0004.html) | Allows to gather data using Forms. | | [Data Forms](dataforms.md) | [XEP-0004](http://xmpp.org/extensions/xep-0004.html) | Allows to gather data using Forms. |
| Last Activity | [XEP-0012](http://xmpp.org/extensions/xep-0012.html) | Communicating information about the last activity associated with an XMPP entity. | | Last Activity | [XEP-0012](http://xmpp.org/extensions/xep-0012.html) | Communicating information about the last activity associated with an XMPP entity. |
| Flexible Offline Message Retrieval | [XEP-0013](http://xmpp.org/extensions/xep-0013.html) | Extension for flexible, POP3-like handling of offline messages. | | Flexible Offline Message Retrieval | [XEP-0013](http://xmpp.org/extensions/xep-0013.html) | Extension for flexible, POP3-like handling of offline messages. |
| [Privacy Lists](privacy.html) | [XEP-0016](http://xmpp.org/extensions/xep-0016.html) | Enabling or disabling communication with other entities. | | [Privacy Lists](privacy.md) | [XEP-0016](http://xmpp.org/extensions/xep-0016.html) | Enabling or disabling communication with other entities. |
| [Service Discovery](disco.html) | [XEP-0030](http://xmpp.org/extensions/xep-0030.html) | Allows to discover services in XMPP entities. | | [Service Discovery](disco.md) | [XEP-0030](http://xmpp.org/extensions/xep-0030.html) | Allows to discover services in XMPP entities. |
| Extended Stanza Addressing | [XEP-0033](http://xmpp.org/extensions/xep-0033.html) | Allows to include headers in stanzas in order to specifiy multiple recipients or sub-addresses. | | Extended Stanza Addressing | [XEP-0033](http://xmpp.org/extensions/xep-0033.html) | Allows to include headers in stanzas in order to specifiy multiple recipients or sub-addresses. |
| [Multi User Chat](muc.html) | [XEP-0045](http://xmpp.org/extensions/xep-0045.html) | Allows configuration of, participation in, and administration of individual text-based conference rooms. | | [Multi User Chat](muc.md) | [XEP-0045](http://xmpp.org/extensions/xep-0045.html) | Allows configuration of, participation in, and administration of individual text-based conference rooms. |
| In-Band Bytestreams | [XEP-0047](http://xmpp.org/extensions/xep-0047.html) | Enables any two entities to establish a one-to-one bytestream between themselves using plain XMPP. | | In-Band Bytestreams | [XEP-0047](http://xmpp.org/extensions/xep-0047.html) | Enables any two entities to establish a one-to-one bytestream between themselves using plain XMPP. |
| Bookmarks | [XEP-0048](http://xmpp.org/extensions/xep-0048.html) | Bookmarks, for e.g. MUC and web pages. | | Bookmarks | [XEP-0048](http://xmpp.org/extensions/xep-0048.html) | Bookmarks, for e.g. MUC and web pages. |
| [Private Data](privatedata.html) | [XEP-0049](http://xmpp.org/extensions/xep-0049.html) | Manages private data. | | [Private Data](privatedata.md) | [XEP-0049](http://xmpp.org/extensions/xep-0049.html) | Manages private data. |
| Ad-Hoc Commands | [XEP-0050](http://xmpp.org/extensions/xep-0050.html) | Advertising and executing application-specific commands. | | Ad-Hoc Commands | [XEP-0050](http://xmpp.org/extensions/xep-0050.html) | Advertising and executing application-specific commands. |
| vcard-temp | [XEP-0054](http://xmpp.org/extensions/xep-0054.html) | The vCard-XML format currently in use. | | vcard-temp | [XEP-0054](http://xmpp.org/extensions/xep-0054.html) | The vCard-XML format currently in use. |
| Jabber Search | [XEP-0055](http://xmpp.org/extensions/xep-0055.html) | Search information repositories on the XMPP network. | | Jabber Search | [XEP-0055](http://xmpp.org/extensions/xep-0055.html) | Search information repositories on the XMPP network. |
| Result Set Management | [XEP-0059](http://xmpp.org/extensions/xep-0059.html) | Page through and otherwise manage the receipt of large result sets | | Result Set Management | [XEP-0059](http://xmpp.org/extensions/xep-0059.html) | Page through and otherwise manage the receipt of large result sets |
| [PubSub](pubsub.html) | [XEP-0060](http://xmpp.org/extensions/xep-0060.html) | Generic publish and subscribe functionality. | | [PubSub](pubsub.md) | [XEP-0060](http://xmpp.org/extensions/xep-0060.html) | Generic publish and subscribe functionality. |
| SOCKS5 Bytestrams | [XEP-0065](http://xmpp.org/extensions/xep-0065.html) | Out-of-band bytestream between any two XMPP entities. | | SOCKS5 Bytestrams | [XEP-0065](http://xmpp.org/extensions/xep-0065.html) | Out-of-band bytestream between any two XMPP entities. |
| [XHTML-IM](xhtml.html) | [XEP-0071](http://xmpp.org/extensions/xep-0071.html) | Allows send and receiving formatted messages using XHTML. | | [XHTML-IM](xhtml.md) | [XEP-0071](http://xmpp.org/extensions/xep-0071.html) | Allows send and receiving formatted messages using XHTML. |
| In-Band Registration | [XEP-0077](http://xmpp.org/extensions/xep-0077.html) | In-band registration with XMPP services. | | In-Band Registration | [XEP-0077](http://xmpp.org/extensions/xep-0077.html) | In-band registration with XMPP services. |
| Advanced Message Processing | [XEP-0079](http://xmpp.org/extensions/xep-0079.html) | Enables entities to request, and servers to perform, advanced processing of XMPP message stanzas. | | Advanced Message Processing | [XEP-0079](http://xmpp.org/extensions/xep-0079.html) | Enables entities to request, and servers to perform, advanced processing of XMPP message stanzas. |
| XMPP Date Time Profiles | [XEP-0082](http://xmpp.org/extensions/xep-0082.html) | Standardization of Date and Time representation in XMPP. | | XMPP Date Time Profiles | [XEP-0082](http://xmpp.org/extensions/xep-0082.html) | Standardization of Date and Time representation in XMPP. |
| Chat State Notifications | [XEP-0085](http://xmpp.org/extensions/xep-0085.html) | Communicating the status of a user in a chat session. | | Chat State Notifications | [XEP-0085](http://xmpp.org/extensions/xep-0085.html) | Communicating the status of a user in a chat session. |
| [Time Exchange](time.html) | [XEP-0090](http://xmpp.org/extensions/xep-0090.html) | Allows local time information to be shared between users. | | [Time Exchange](time.md) | [XEP-0090](http://xmpp.org/extensions/xep-0090.html) | Allows local time information to be shared between users. |
| Software Version | [XEP-0092](http://xmpp.org/extensions/xep-0092.html) | Retrieve and announce the software application of an XMPP entity. | | Software Version | [XEP-0092](http://xmpp.org/extensions/xep-0092.html) | Retrieve and announce the software application of an XMPP entity. |
| Stream Initation | [XEP-0095](http://xmpp.org/extensions/xep-0095.html) | Initiating a data stream between any two XMPP entities. | | Stream Initation | [XEP-0095](http://xmpp.org/extensions/xep-0095.html) | Initiating a data stream between any two XMPP entities. |
| [SI File Transfer](filetransfer.html) | [XEP-0096](http://xmpp.org/extensions/xep-0096.html) | Transfer files between two users over XMPP. | | [SI File Transfer](filetransfer.md) | [XEP-0096](http://xmpp.org/extensions/xep-0096.html) | Transfer files between two users over XMPP. |
| [Entity Capabilities](caps.html) | [XEP-0115](http://xmpp.org/extensions/xep-0115.html) | Broadcasting and dynamic discovery of entity capabilities. | | [Entity Capabilities](caps.md) | [XEP-0115](http://xmpp.org/extensions/xep-0115.html) | Broadcasting and dynamic discovery of entity capabilities. |
| Data Forms Validation | [XEP-0122](http://xmpp.org/extensions/xep-0122.html) | Enables an application to specify additional validation guidelines . | | Data Forms Validation | [XEP-0122](http://xmpp.org/extensions/xep-0122.html) | Enables an application to specify additional validation guidelines . |
| Stream Compression | [XEP-0138](http://xmpp.org/extensions/xep-0138.html) | Support for optional compression of the XMPP stream. | Stream Compression | [XEP-0138](http://xmpp.org/extensions/xep-0138.html) | Support for optional compression of the XMPP stream.
| Data Forms Layout | [XEP-0141](http://xmpp.org/extensions/xep-0141.html) | Enables an application to specify form layouts. | | Data Forms Layout | [XEP-0141](http://xmpp.org/extensions/xep-0141.html) | Enables an application to specify form layouts. |
@ -58,8 +58,8 @@ Smack Extensions and currently supported XEPs by Smack (smack-extensions)
| Delayed Delivery | [XEP-0203](http://xmpp.org/extensions/xep-0203.html) | Extension for communicating the fact that an XML stanza has been delivered with a delay. | | Delayed Delivery | [XEP-0203](http://xmpp.org/extensions/xep-0203.html) | Extension for communicating the fact that an XML stanza has been delivered with a delay. |
| XMPP Over BOSH | [XEP-0206](http://xmpp.org/extensions/xep-0206.html) | Use Bidirectional-streams Over Synchronous HTTP (BOSH) to transport XMPP stanzas. | | XMPP Over BOSH | [XEP-0206](http://xmpp.org/extensions/xep-0206.html) | Use Bidirectional-streams Over Synchronous HTTP (BOSH) to transport XMPP stanzas. |
| Attention | [XEP-0224](http://xmpp.org/extensions/xep-0224.html) | Getting attention of another user. | | Attention | [XEP-0224](http://xmpp.org/extensions/xep-0224.html) | Getting attention of another user. |
| [Group Chat Invitations](invitation.html) | n/a | Send invitations to other users to join a group chat room. | | [Group Chat Invitations](invitation.md) | n/a | Send invitations to other users to join a group chat room. |
| [Jive Properties](properties.html) | n/a | TODO | | [Jive Properties](properties.md) | n/a | TODO |
Experimental Smack Extensions and currently supported XEPs by Smack (smack-experimental) Experimental Smack Extensions and currently supported XEPs by Smack (smack-experimental)
@ -68,7 +68,7 @@ Experimental Smack Extensions and currently supported XEPs by Smack (smack-exper
| Name | XEP | Description | | Name | XEP | Description |
|---------------------------------------------|----------------------------------------------------------|----------------------------------------------------------------------------------------------------------| |---------------------------------------------|----------------------------------------------------------|----------------------------------------------------------------------------------------------------------|
| Message Carbons | [XEP-0280](http://xmpp.org/extensions/xep-0280.html) | Keep all IM clients for a user engaged in a conversation, by carbon-copy outbound messages to all interested resources. | Message Carbons | [XEP-0280](http://xmpp.org/extensions/xep-0280.html) | Keep all IM clients for a user engaged in a conversation, by carbon-copy outbound messages to all interested resources.
| [HTTP over XMPP transport](hoxt.html) | [XEP-0332](http://xmpp.org/extensions/xep-0332.html) | Allows to transport HTTP communication over XMPP peer-to-peer networks. | | [HTTP over XMPP transport](hoxt.md) | [XEP-0332](http://xmpp.org/extensions/xep-0332.html) | Allows to transport HTTP communication over XMPP peer-to-peer networks. |
| JSON Containers | [XEP-0335](http://xmpp.org/extensions/xep-0335.html) | Encapsulation of JSON data within XMPP Stanzas. | | JSON Containers | [XEP-0335](http://xmpp.org/extensions/xep-0335.html) | Encapsulation of JSON data within XMPP Stanzas. |
| Google GCM JSON payload | n/a | Semantically the same as XEP-0335: JSON Containers | | Google GCM JSON payload | n/a | Semantically the same as XEP-0335: JSON Containers |
| Client State Indication | [XEP-0352](http://xmpp.org/extensions/xep-0352.html) | A way for the client to indicate its active/inactive state. | | Client State Indication | [XEP-0352](http://xmpp.org/extensions/xep-0352.html) | A way for the client to indicate its active/inactive state. |
@ -81,6 +81,6 @@ If a XEP becomes 'Deprecated' or 'Obsolete' the code will be moved to the *smack
| Name | XEP | Description | | Name | XEP | Description |
|---------------------------------------------|----------------------------------------------------------|----------------------------------------------------------------------------------------------------------| |---------------------------------------------|----------------------------------------------------------|----------------------------------------------------------------------------------------------------------|
| [Message Events](messageevents.html) | [XEP-0022](http://xmpp.org/extensions/xep-0022.html) | Requests and responds to message events. | | [Message Events](messageevents.md) | [XEP-0022](http://xmpp.org/extensions/xep-0022.html) | Requests and responds to message events. |
| [Roster Item Exchange](rosterexchange.html) | [XEP-0093](http://xmpp.org/extensions/xep-0093.html) | Allows roster data to be shared between users. | | [Roster Item Exchange](rosterexchange.md) | [XEP-0093](http://xmpp.org/extensions/xep-0093.html) | Allows roster data to be shared between users. |

30
documentation/extensions/intro.md
View file

@ -6,92 +6,92 @@ Current Extensions
**XEP #** **XEP #**
**Description** **Description**
[Private Data](privatedata.html) [Private Data](privatedata.md)
[XEP-0049](http://www.xmpp.org/extensions/xep-0049.html) [XEP-0049](http://www.xmpp.org/extensions/xep-0049.html)
Manages private data. Manages private data.
[XHTML Messages](xhtml.html) [XHTML Messages](xhtml.md)
[XEP-0071](http://www.xmpp.org/extensions/xep-0071.html) [XEP-0071](http://www.xmpp.org/extensions/xep-0071.html)
Allows send and receiving formatted messages using XHTML. Allows send and receiving formatted messages using XHTML.
[Message Events](messageevents.html) [Message Events](messageevents.md)
[XEP-0022](http://www.xmpp.org/extensions/xep-0022.html) [XEP-0022](http://www.xmpp.org/extensions/xep-0022.html)
Requests and responds to message events. Requests and responds to message events.
[Data Forms](dataforms.html) [Data Forms](dataforms.md)
[XEP-0004](http://www.xmpp.org/extensions/xep-0004.html) [XEP-0004](http://www.xmpp.org/extensions/xep-0004.html)
Allows to gather data using Forms. Allows to gather data using Forms.
[Multi User Chat](muc.html) [Multi User Chat](muc.md)
[XEP-0045](http://www.xmpp.org/extensions/xep-0045.html) [XEP-0045](http://www.xmpp.org/extensions/xep-0045.html)
Allows configuration of, participation in, and administration of individual Allows configuration of, participation in, and administration of individual
text-based conference rooms. text-based conference rooms.
[Roster Item Exchange](rosterexchange.html) [Roster Item Exchange](rosterexchange.md)
[XEP-0093](http://www.xmpp.org/extensions/xep-0093.html) [XEP-0093](http://www.xmpp.org/extensions/xep-0093.html)
Allows roster data to be shared between users. Allows roster data to be shared between users.
[Time Exchange](time.html) [Time Exchange](time.md)
[XEP-0090](http://www.xmpp.org/extensions/xep-0090.html) [XEP-0090](http://www.xmpp.org/extensions/xep-0090.html)
Allows local time information to be shared between users. Allows local time information to be shared between users.
[Group Chat Invitations](invitation.html) [Group Chat Invitations](invitation.md)
N/A N/A
Send invitations to other users to join a group chat room. Send invitations to other users to join a group chat room.
[Service Discovery](disco.html) [Service Discovery](disco.md)
[XEP-0030](http://www.xmpp.org/extensions/xep-0030.html) [XEP-0030](http://www.xmpp.org/extensions/xep-0030.html)
Allows to discover services in XMPP entities. Allows to discover services in XMPP entities.
[File Transfer](filetransfer.html) [File Transfer](filetransfer.md)
[XEP-0096](http://www.xmpp.org/extensions/xep-0096.html) [XEP-0096](http://www.xmpp.org/extensions/xep-0096.html)
Transfer files between two users over XMPP. Transfer files between two users over XMPP.
[PubSub](pubsub.html) [PubSub](pubsub.md)
[XEP-0060](http://www.xmpp.org/extensions/xep-0060.html) [XEP-0060](http://www.xmpp.org/extensions/xep-0060.html)
Generic publish and subscribe functionality. Generic publish and subscribe functionality.
[Entity Capabilities](caps.html) [Entity Capabilities](caps.md)
[XEP-0115](http://www.xmpp.org/extensions/xep-0115.html) [XEP-0115](http://www.xmpp.org/extensions/xep-0115.html)
Broadcasting and dynamic discovery of entity capabilities. Broadcasting and dynamic discovery of entity capabilities.
[Privacy Lists](privacy.html) [Privacy Lists](privacy.md)
[XEP-0016](http://www.xmpp.org/extensions/xep-0016.html) [XEP-0016](http://www.xmpp.org/extensions/xep-0016.html)
Enabling or disabling communication with other entities. Enabling or disabling communication with other entities.
[HTTP over XMPP transport](hoxt.html) [HTTP over XMPP transport](hoxt.md)
[XEP-0332](http://www.xmpp.org/extensions/xep-0332.html) [XEP-0332](http://www.xmpp.org/extensions/xep-0332.html)
Allows to transport HTTP communication over XMPP peer-to-peer networks. Allows to transport HTTP communication over XMPP peer-to-peer networks.
[Jive Properties](properties.html) [Jive Properties](properties.md)
N/A N/A

8
documentation/gettingstarted.md
View file

@ -1,7 +1,7 @@
Smack: Getting Started Smack: Getting Started
====================== ======================
[Back](index.html) [Back](index.md)
This document will introduce you to the Smack API and provide an overview of This document will introduce you to the Smack API and provide an overview of
important classes and concepts. important classes and concepts.
@ -15,14 +15,14 @@ features applications require:
* `smack-core.jar` -- provides core XMPP functionality. All XMPP features that are part of the XMPP RFCs are included. * `smack-core.jar` -- provides core XMPP functionality. All XMPP features that are part of the XMPP RFCs are included.
* `smack-tcp.jar` -- support for XMPP over TCP. Includes XMPPTCPConnection class, which you usually want to use * `smack-tcp.jar` -- support for XMPP over TCP. Includes XMPPTCPConnection class, which you usually want to use
* `smack-extensions.jar` -- support for many of the extensions (XEPs) defined by the XMPP Standards Foundation, including multi-user chat, file transfer, user search, etc. The extensions are documented in the [extensions manual](extensions/index.html). * `smack-extensions.jar` -- support for many of the extensions (XEPs) defined by the XMPP Standards Foundation, including multi-user chat, file transfer, user search, etc. The extensions are documented in the [extensions manual](extensions/index.md).
* `smack-experimental.jar` -- support for experimental extensions (XEPs) defined by the XMPP Standards Foundation. The API and functionality of those extensions should be considered as unstable. * `smack-experimental.jar` -- support for experimental extensions (XEPs) defined by the XMPP Standards Foundation. The API and functionality of those extensions should be considered as unstable.
* `smack-legacy.jar` -- support for legacy extensions (XEPs) defined by the XMPP Standards Foundation. * `smack-legacy.jar` -- support for legacy extensions (XEPs) defined by the XMPP Standards Foundation.
* `smack-bosh.jar` -- support for BOSH (XEP-0124). This code should be considered as beta. * `smack-bosh.jar` -- support for BOSH (XEP-0124). This code should be considered as beta.
* `smack-jingle.jar` -- support for Jingle. This code is old and currenlty unmaintained. * `smack-jingle.jar` -- support for Jingle. This code is old and currenlty unmaintained.
* `smack-resolver-dnsjava.jar` -- support for resolving DNS SRV records with the help of dnsjava. Ideal for platforms that do not support the javax.naming API. * `smack-resolver-dnsjava.jar` -- support for resolving DNS SRV records with the help of dnsjava. Ideal for platforms that do not support the javax.naming API.
* `smack-resolver-javax.jar` -- support for resolving DNS SRV records with the javax namespace API. * `smack-resolver-javax.jar` -- support for resolving DNS SRV records with the javax namespace API.
* `smack-debug.jar` -- an enhanced GUI debugger for protocol traffic. It will automatically be used when found in the classpath and when [debugging](debugging.html) is enabled. * `smack-debug.jar` -- an enhanced GUI debugger for protocol traffic. It will automatically be used when found in the classpath and when [debugging](debugging.md) is enabled.
Configuration Configuration
------------- -------------
@ -65,7 +65,7 @@ Note that maximum security will be used when connecting to the server by
default (and when possible), including use of TLS encryption. The default (and when possible), including use of TLS encryption. The
ConnectionConfiguration class provides advanced control over the connection ConnectionConfiguration class provides advanced control over the connection
created, such as the ability to disable or require encryption. See created, such as the ability to disable or require encryption. See
[XMPPConnection Management](connections.html) for full details. [XMPPConnection Management](connections.md) for full details.
Once you've created a connection, you should login with the Once you've created a connection, you should login with the
`XMPPConnection.login()` method. Once you've logged in, you can being `XMPPConnection.login()` method. Once you've logged in, you can being

18
documentation/index.md
View file

@ -2,13 +2,13 @@
**Contents:** **Contents:**
* [Overview](overview.html) * [Overview](overview.md)
* [Getting Started Guide](gettingstarted.html) * [Getting Started Guide](gettingstarted.md)
* [Managing Connections](connections.html) * [Managing Connections](connections.md)
* [Messaging Basics](messaging.html) * [Messaging Basics](messaging.md)
* [Roster and Presence](roster.html) * [Roster and Presence](roster.md)
* [Processing Incoming Stanzas](processing.html) * [Processing Incoming Stanzas](processing.md)
* [Provider Architecture](providers.html) * [Provider Architecture](providers.md)
* [Debugging with Smack](debugging.html) * [Debugging with Smack](debugging.md)
* [Smack Extensions Manual](extensions/index.html) * [Smack Extensions Manual](extensions/index.md)

2
documentation/messaging.md
View file

@ -1,7 +1,7 @@
Messaging using Chats Messaging using Chats
===================== =====================
[Back](index.html) [Back](index.md)
Sending messages back and forth is at the core of instant messaging. Although Sending messages back and forth is at the core of instant messaging. Although
individual messages can be sent and received as packets, it's generally easier individual messages can be sent and received as packets, it's generally easier

2
documentation/overview.md
View file

@ -1,7 +1,7 @@
Smack Overview Smack Overview
============== ==============
[Back](index.html) [Back](index.md)
Smack is a library for communicating with XMPP servers to perform real-time Smack is a library for communicating with XMPP servers to perform real-time
communications, including instant messaging and group chat. communications, including instant messaging and group chat.

2
documentation/processing.md
View file

@ -1,7 +1,7 @@
Processing Incoming Stanzas Processing Incoming Stanzas
=========================== ===========================
[Back](index.html) [Back](index.md)
Smack provides a flexible framework for processing incoming packets using two Smack provides a flexible framework for processing incoming packets using two
constructs: constructs:

4
documentation/providers.md
View file

@ -1,14 +1,14 @@
Provider Architecture: Stanza Extensions and Custom IQ's Provider Architecture: Stanza Extensions and Custom IQ's
======================================================== ========================================================
[Back](index.html) [Back](index.md)
Introduction Introduction
------------ ------------
The Smack provider architecture is a system for plugging in custom XML parsing The Smack provider architecture is a system for plugging in custom XML parsing
of packet extensions and IQ packets. The standard [Smack of packet extensions and IQ packets. The standard [Smack
Extensions](extensions/index.html) are built using the provider architecture. Extensions](extensions/index.md) are built using the provider architecture.
There are two types of providers: There are two types of providers:
* `IQProvider` -- parses IQ requests into Java objects. * `IQProvider` -- parses IQ requests into Java objects.

2
documentation/roster.md
View file

@ -1,7 +1,7 @@
Roster and Presence Roster and Presence
=================== ===================
[Back](index.html) [Back](index.md)
The roster lets you keep track of the availability ("presence") of other The roster lets you keep track of the availability ("presence") of other
users. A roster also allows you to organize users into groups such as users. A roster also allows you to organize users into groups such as

7
smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
View file

@ -199,7 +199,14 @@ public class XMPPError extends AbstractError {
xml.halfOpenElement(condition.toString()); xml.halfOpenElement(condition.toString());
xml.xmlnsAttribute(NAMESPACE); xml.xmlnsAttribute(NAMESPACE);
if (conditionText != null) {
xml.rightAngleBracket();
xml.escape(conditionText);
xml.closeElement(condition.toString());
}
else {
xml.closeEmptyElement(); xml.closeEmptyElement();
}
addDescriptiveTextsAndExtensions(xml); addDescriptiveTextsAndExtensions(xml);

5
smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
View file

@ -21,6 +21,7 @@ import java.io.IOException;
import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.ParserUtils; import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.Mode;
import org.jxmpp.jid.Jid; import org.jxmpp.jid.Jid;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
@ -83,7 +84,11 @@ public class BytestreamsProvider extends IQProvider<Bytestream> {
} }
} }
if (mode == null) {
toReturn.setMode(Mode.tcp);
} else {
toReturn.setMode((Bytestream.Mode.fromName(mode))); toReturn.setMode((Bytestream.Mode.fromName(mode)));
}
toReturn.setSessionID(id); toReturn.setSessionID(id);
return toReturn; return toReturn;
} }

6
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
View file

@ -1635,11 +1635,10 @@ public class MultiUserChat {
* Sends a message to the chat room. * Sends a message to the chat room.
* *
* @param text the text of the message to send. * @param text the text of the message to send.
* @throws XMPPException if sending the message fails.
* @throws NotConnectedException * @throws NotConnectedException
* @throws InterruptedException * @throws InterruptedException
*/ */
public void sendMessage(String text) throws XMPPException, NotConnectedException, InterruptedException { public void sendMessage(String text) throws NotConnectedException, InterruptedException {
Message message = createMessage(); Message message = createMessage();
message.setBody(text); message.setBody(text);
connection.sendStanza(message); connection.sendStanza(message);
@ -1673,11 +1672,10 @@ public class MultiUserChat {
* Sends a Message to the chat room. * Sends a Message to the chat room.
* *
* @param message the message. * @param message the message.
* @throws XMPPException if sending the message fails.
* @throws NotConnectedException * @throws NotConnectedException
* @throws InterruptedException * @throws InterruptedException
*/ */
public void sendMessage(Message message) throws XMPPException, NotConnectedException, InterruptedException { public void sendMessage(Message message) throws NotConnectedException, InterruptedException {
message.setTo(room); message.setTo(room);
message.setType(Message.Type.groupchat); message.setType(Message.Type.groupchat);
connection.sendStanza(message); connection.sendStanza(message);

2
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java
View file

@ -27,7 +27,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
* extensions. This effectively extends the idea of an extension within one of the * extensions. This effectively extends the idea of an extension within one of the
* top level {@link Stanza} types to consider any embedded element to be an extension * top level {@link Stanza} types to consider any embedded element to be an extension
* of its parent. This more easily enables the usage of some of Smacks parsing * of its parent. This more easily enables the usage of some of Smacks parsing
* utilities such as {@link PacketParserUtils#parsePacketExtension(String, String, org.xmlpull.v1.XmlPullParser)} to be used * utilities such as {@link PacketParserUtils#parseExtensionElement(String, String, org.xmlpull.v1.XmlPullParser)} to be used
* to parse any element of the XML being parsed. * to parse any element of the XML being parsed.
* *
* <p>Top level extensions have only one element, but they can have multiple children, or * <p>Top level extensions have only one element, but they can have multiple children, or