vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch '4.2'

This commit is contained in:
Florian Schmaus 2018-02-10 12:14:09 +01:00
parent 6f7d6a7f50 278c15d52d
commit 5333bde2e8
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
smack-extensions/src/main/java/org/jivesoftware/smack/chat2/ChatManager.java
View File

@ -218,12 +218,24 @@ public final class ChatManager extends Manager {
* *
* @param listener the listener to remove. * @param listener the listener to remove.
* @return <code>true</code> if the listener was active and got removed. * @return <code>true</code> if the listener was active and got removed.
* @deprecated Use {@link #removeIncomingListener(IncomingChatMessageListener)} instead.
*/ */
@Deprecated
@SuppressWarnings("FunctionalInterfaceClash") @SuppressWarnings("FunctionalInterfaceClash")
public boolean removeListener(IncomingChatMessageListener listener) { public boolean removeListener(IncomingChatMessageListener listener) {
return incomingListeners.remove(listener); return incomingListeners.remove(listener);
} }
/**
* Remove an incoming chat message listener.
*
* @param listener the listener to remove.
* @return <code>true</code> if the listener was active and got removed.
*/
public boolean removeIncomingListener(IncomingChatMessageListener listener) {
return incomingListeners.remove(listener);
}
/** /**
* Add a new listener for outgoing chat messages. * Add a new listener for outgoing chat messages.
* *
@ -252,9 +264,11 @@ public final class ChatManager extends Manager {
* *
* @param listener the listener to remove. * @param listener the listener to remove.
* @return <code>true</code> if the listener was active and got removed. * @return <code>true</code> if the listener was active and got removed.
* @deprecated use {@link #removeOutgoingListener(OutgoingChatMessageListener)} instead.
*/ */
@Deprecated
public boolean removeListener(OutgoingChatMessageListener listener) { public boolean removeListener(OutgoingChatMessageListener listener) {
return outgoingListeners.remove(listener); return removeOutgoingListener(listener);
} }
/** /**
@ -262,11 +276,9 @@ public final class ChatManager extends Manager {
* *
* @param listener the listener to remove. * @param listener the listener to remove.
* @return <code>true</code> if the listener was active and got removed. * @return <code>true</code> if the listener was active and got removed.
* @deprecated use {@link #removeListener(OutgoingChatMessageListener)} instead.
*/ */
@Deprecated public boolean removeOutgoingListener(OutgoingChatMessageListener listener) {
public boolean removeOutoingLIstener(OutgoingChatMessageListener listener) { return outgoingListeners.remove(listener);
return removeListener(listener);
} }
/** /**

10
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
View File

@ -638,9 +638,9 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
packetWriter = new PacketWriter(); packetWriter = new PacketWriter();
packetReader = new PacketReader(); packetReader = new PacketReader();
} }
// Start the packet writer. This will open an XMPP stream to the server // Start the writer thread. This will open an XMPP stream to the server
packetWriter.init(); packetWriter.init();
// Start the packet reader. The startup() method will block until we // Start the reader thread. The startup() method will block until we
// get an opening stream packet back from server // get an opening stream packet back from server
packetReader.init(); packetReader.init();
} }
@ -1001,7 +1001,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
public void run() { public void run() {
parsePackets(); parsePackets();
} }
}, "Smack Packet Reader (" + getConnectionCounter() + ")"); }, "Smack Reader (" + getConnectionCounter() + ")");
} }
/** /**
@ -1297,7 +1297,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
public void run() { public void run() {
writePackets(); writePackets();
} }
}, "Smack Packet Writer (" + getConnectionCounter() + ")"); }, "Smack Writer (" + getConnectionCounter() + ")");
} }
private boolean done() { private boolean done() {
@ -1375,7 +1375,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
catch (InterruptedException e) { catch (InterruptedException e) {
if (!queue.isShutdown()) { if (!queue.isShutdown()) {
// Users shouldn't try to interrupt the packet writer thread // Users shouldn't try to interrupt the packet writer thread
LOGGER.log(Level.WARNING, "Packet writer thread was interrupted. Don't do that. Use disconnect() instead.", e); LOGGER.log(Level.WARNING, "Writer thread was interrupted. Don't do that. Use disconnect() instead.", e);
} }
} }
return packet; return packet;