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

4
smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
View file

@ -50,7 +50,7 @@ import org.jxmpp.jid.Jid;
* </p>
* <pre>
* deliveryReceiptManager.addReceiptReceivedListener(new ReceiptReceivedListener() {
* void onReceiptReceived(String fromJid, String toJid, String receiptId, Packet receipt) {
* void onReceiptReceived(String fromJid, String toJid, String receiptId, Stanza(/Packet) receipt) {
* // If the receiving entity does not support delivery receipts,
* // then the receipt received listener may not get invoked.
* }
@ -266,7 +266,7 @@ public class DeliveryReceiptManager extends Manager {
/**
* Test if a message requires a delivery receipt.
*
* @param message Packet object to check for a DeliveryReceiptRequest
* @param message Stanza(/Packet) object to check for a DeliveryReceiptRequest
*
* @return true if a delivery receipt was requested
*/

2
smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java
View file

@ -34,7 +34,7 @@ public interface ReceiptReceivedListener {
*
* @param fromJid the jid that send this receipt
* @param toJid the jid which received this receipt
* @param receiptId the message ID of the packet which has been received and this receipt is for
* @param receiptId the message ID of the stanza(/packet) which has been received and this receipt is for
* @param receipt the receipt
*/
void onReceiptReceived(Jid fromJid, Jid toJid, String receiptId, Stanza receipt);