mirror of
https://github.com/vanitasvitae/Smack.git
synced 2025-09-10 09:39:39 +02:00
SMACK-279: The XMPPConnection extends the new abstract Connection class
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11613 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
11a41e79ca
commit
127319a821
102 changed files with 1420 additions and 1194 deletions
|
@ -20,7 +20,7 @@
|
|||
|
||||
package org.jivesoftware.smackx;
|
||||
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.Connection;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.packet.Message;
|
||||
import org.jivesoftware.smack.packet.Packet;
|
||||
|
@ -67,7 +67,7 @@ public class MultipleRecipientManager {
|
|||
* @throws XMPPException if server does not support JEP-33: Extended Stanza Addressing and
|
||||
* some JEP-33 specific features were requested.
|
||||
*/
|
||||
public static void send(XMPPConnection connection, Packet packet, List to, List cc, List bcc)
|
||||
public static void send(Connection connection, Packet packet, List to, List cc, List bcc)
|
||||
throws XMPPException {
|
||||
send(connection, packet, to, cc, bcc, null, null, false);
|
||||
}
|
||||
|
@ -95,7 +95,7 @@ public class MultipleRecipientManager {
|
|||
* @throws XMPPException if server does not support JEP-33: Extended Stanza Addressing and
|
||||
* some JEP-33 specific features were requested.
|
||||
*/
|
||||
public static void send(XMPPConnection connection, Packet packet, List to, List cc, List bcc,
|
||||
public static void send(Connection connection, Packet packet, List to, List cc, List bcc,
|
||||
String replyTo, String replyRoom, boolean noReply) throws XMPPException {
|
||||
String serviceAddress = getMultipleRecipienServiceAddress(connection);
|
||||
if (serviceAddress != null) {
|
||||
|
@ -127,7 +127,7 @@ public class MultipleRecipientManager {
|
|||
* @throws XMPPException if the original message was not sent to multiple recipients, or the
|
||||
* original message cannot be replied or reply should be sent to a room.
|
||||
*/
|
||||
public static void reply(XMPPConnection connection, Message original, Message reply)
|
||||
public static void reply(Connection connection, Message original, Message reply)
|
||||
throws XMPPException {
|
||||
MultipleRecipientInfo info = getMultipleRecipientInfo(original);
|
||||
if (info == null) {
|
||||
|
@ -201,7 +201,7 @@ public class MultipleRecipientManager {
|
|||
return extension == null ? null : new MultipleRecipientInfo(extension);
|
||||
}
|
||||
|
||||
private static void sendToIndividualRecipients(XMPPConnection connection, Packet packet,
|
||||
private static void sendToIndividualRecipients(Connection connection, Packet packet,
|
||||
List to, List cc, List bcc) {
|
||||
if (to != null) {
|
||||
for (Iterator it = to.iterator(); it.hasNext();) {
|
||||
|
@ -226,7 +226,7 @@ public class MultipleRecipientManager {
|
|||
}
|
||||
}
|
||||
|
||||
private static void sendThroughService(XMPPConnection connection, Packet packet, List to,
|
||||
private static void sendThroughService(Connection connection, Packet packet, List to,
|
||||
List cc, List bcc, String replyTo, String replyRoom, boolean noReply,
|
||||
String serviceAddress) {
|
||||
// Create multiple recipient extension
|
||||
|
@ -280,7 +280,7 @@ public class MultipleRecipientManager {
|
|||
* queried.
|
||||
* @return the address of the multiple recipients service or <tt>null</tt> if none was found.
|
||||
*/
|
||||
private static String getMultipleRecipienServiceAddress(XMPPConnection connection) {
|
||||
private static String getMultipleRecipienServiceAddress(Connection connection) {
|
||||
String serviceName = connection.getServiceName();
|
||||
String serviceAddress = (String) services.get(serviceName);
|
||||
if (serviceAddress == null) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue