From 8bf74c6e927d13010477cb716e1d5623ac52226d Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sun, 5 Oct 2014 12:54:12 +0200 Subject: [PATCH] Add Packet to onReceiptReceived parameters in ReceiptReceivedListener. SMACK-582 --- .../jivesoftware/smackx/receipts/DeliveryReceiptManager.java | 2 +- .../smackx/receipts/ReceiptReceivedListener.java | 5 ++++- .../jivesoftware/smackx/receipts/DeliveryReceiptTest.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java index d12e38e48..191d63da7 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java @@ -105,7 +105,7 @@ public class DeliveryReceiptManager extends Manager implements PacketListener { if (dr != null) { // notify listeners of incoming receipt for (ReceiptReceivedListener l : receiptReceivedListeners) { - l.onReceiptReceived(packet.getFrom(), packet.getTo(), dr.getId()); + l.onReceiptReceived(packet.getFrom(), packet.getTo(), dr.getId(), packet); } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java index dcaf23a66..850ba9426 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java @@ -16,6 +16,8 @@ */ package org.jivesoftware.smackx.receipts; +import org.jivesoftware.smack.packet.Packet; + /** * Interface for received receipt notifications. * @@ -32,6 +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 receipt the receipt */ - void onReceiptReceived(String fromJid, String toJid, String receiptId); + void onReceiptReceived(String fromJid, String toJid, String receiptId, Packet receipt); } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java index 560a19599..e08c504d9 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java @@ -90,7 +90,7 @@ public class DeliveryReceiptTest extends InitExtensions { private static class TestReceiptReceivedListener implements ReceiptReceivedListener { public String receiptId = null; @Override - public void onReceiptReceived(String fromJid, String toJid, String receiptId) { + public void onReceiptReceived(String fromJid, String toJid, String receiptId, Packet receipt) { assertEquals("julia@capulet.com", fromJid); assertEquals("romeo@montague.com", toJid); assertEquals("original-test-id", receiptId);