Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 16:22:06 +01:00
Code Issues Releases Wiki Activity

Use async packet listener in AdHocCommandManager

Browse source 
also some minor cleanup and logging.
This commit is contained in:
Florian Schmaus 2015-01-05 20:18:35 +01:00
parent f78a615d09
commit 61cc6a36da
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
View file

@ -23,16 +23,21 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.ConnectionCreationListener;
import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.Manager;
import org.jivesoftware.smack.PacketListener; import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.SmackException.NoResponseException;
import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPConnectionRegistry;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.XMPPException.XMPPErrorException;
import org.jivesoftware.smack.filter.AndFilter;
import org.jivesoftware.smack.filter.IQTypeFilter;
import org.jivesoftware.smack.filter.PacketFilter; import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.PacketTypeFilter; import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
@ -61,11 +66,16 @@ import org.jivesoftware.smackx.xdata.Form;
public class AdHocCommandManager extends Manager { public class AdHocCommandManager extends Manager {
public static final String NAMESPACE = "http://jabber.org/protocol/commands"; public static final String NAMESPACE = "http://jabber.org/protocol/commands";
private static final Logger LOGGER = Logger.getLogger(AdHocCommandManager.class.getName());
/** /**
* The session time out in seconds. * The session time out in seconds.
*/ */
private static final int SESSION_TIMEOUT = 2 * 60; private static final int SESSION_TIMEOUT = 2 * 60;
private static final PacketFilter AD_HOC_COMMAND_FILTER = new AndFilter(
new PacketTypeFilter(AdHocCommandData.class), IQTypeFilter.SET);
/** /**
* Map a XMPPConnection with it AdHocCommandManager. This map have a key-value * Map a XMPPConnection with it AdHocCommandManager. This map have a key-value
* pair for every active connection. * pair for every active connection.
@ -170,14 +180,13 @@ public class AdHocCommandManager extends Manager {
try { try {
processAdHocCommand(requestData); processAdHocCommand(requestData);
} }
catch (SmackException e) { catch (NotConnectedException | NoResponseException e) {
return; LOGGER.log(Level.INFO, "processAdHocCommand threw exceptino", e);
} }
} }
}; };
PacketFilter filter = new PacketTypeFilter(AdHocCommandData.class); connection.addAsyncPacketListener(listener, AD_HOC_COMMAND_FILTER);
connection.addPacketListener(listener, filter);
sessionsSweeper = null; sessionsSweeper = null;
} }
@ -313,14 +322,10 @@ public class AdHocCommandManager extends Manager {
* *
* @param requestData * @param requestData
* the packet to process. * the packet to process.
* @throws SmackException if there was no response from the server. * @throws NotConnectedException
* @throws NoResponseException
*/ */
private void processAdHocCommand(AdHocCommandData requestData) throws SmackException { private void processAdHocCommand(AdHocCommandData requestData) throws NotConnectedException, NoResponseException {
// Only process requests of type SET
if (requestData.getType() != IQ.Type.set) {
return;
}
// Creates the response with the corresponding data // Creates the response with the corresponding data
AdHocCommandData response = new AdHocCommandData(); AdHocCommandData response = new AdHocCommandData();
response.setTo(requestData.getFrom()); response.setTo(requestData.getFrom());