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

Smack 4.4.2

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAmBcSRtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
 NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
 IFJs0wf/TYm4e4LlBiekmar8YnfaAObT9loDiqMJjO5s4g+trYx2U3gCKkRvKI0P
 U/jzqoJohcPY+5s/fkGKaBWjzFD5WucHyvNaP01D4EWSvHXpCMElbSxY1Uz3X4k1
 t0pmdb27DoHhtdqMfw1Cg7Nba4M+ZzdrEIkDRgCNA8H0mJoKpnsDAg8Y6kEUnvt6
 WQxmIZ49ZT9UOQnVbsXUk4t5DZDz1GdQggrDS5Sh+rZaRFy1KyDgLC+X4NQO99RV
 v3Tf4VRIy+6Nen7L/av3qwSBRqpvc1TEJauNwOnYvyuDwpwjE0tEfRuFZ8wjtkAz
 CKF+LLor+WA5Y2GCXEegLJxVd9Je6Q==
 =hZJ2
 -----END PGP SIGNATURE-----

Merge tag '4.4.2'

Smack 4.4.2
This commit is contained in:
Florian Schmaus 2021-03-25 11:45:03 +01:00
commit 61713c500c
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
resources/releasedocs/changelog.html
View file

@ -141,6 +141,17 @@ hr {
<div id="pageBody"> <div id="pageBody">
<h2>4.4.2 -- <span style="font-weight: normal;">2021-03-25</span></h2>
<h2> Bug
</h2>
<ul>
<li>[<a href='https://igniterealtime.atlassian.net/browse/SMACK-903'>SMACK-903</a>] - StaxXmlPullParser.getNamespace() may throws IllegalArgumentException
</li>
<li>[<a href='https://igniterealtime.atlassian.net/browse/SMACK-904'>SMACK-904</a>] - XEP-0096 file transfer fails because of a hidden ClastCastException
</li>
</ul>
<h2>4.4.1 -- <span style="font-weight: normal;">2021-03-03</span></h2> <h2>4.4.1 -- <span style="font-weight: normal;">2021-03-03</span></h2>
<h2> Bug <h2> Bug

2
smack-extensions/src/main/java/org/jivesoftware/smack/chat2/ChatManager.java
View file

@ -161,7 +161,7 @@ public final class ChatManager extends Manager {
} }
final EntityFullJid fullFrom = from.asEntityFullJidIfPossible(); final EntityFullJid fullFrom = from.asEntityFullJidIfPossible();
if (!chat.lockedResource.equals(fullFrom)) { if (chat.lockedResource.equals(fullFrom)) {
return; return;
} }

5
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
View file

@ -57,6 +57,7 @@ import org.jivesoftware.smack.filter.ToMatchesFilter;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.MessageBuilder; import org.jivesoftware.smack.packet.MessageBuilder;
import org.jivesoftware.smack.packet.MessageView;
import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.Objects;
@ -2034,16 +2035,18 @@ public class MultiUserChat {
* Sends a Message to the chat room. * Sends a Message to the chat room.
* *
* @param messageBuilder the message. * @param messageBuilder the message.
* @return a read-only view of the send message.
* @throws NotConnectedException if the XMPP connection is not connected. * @throws NotConnectedException if the XMPP connection is not connected.
* @throws InterruptedException if the calling thread was interrupted. * @throws InterruptedException if the calling thread was interrupted.
*/ */
public void sendMessage(MessageBuilder messageBuilder) throws NotConnectedException, InterruptedException { public MessageView sendMessage(MessageBuilder messageBuilder) throws NotConnectedException, InterruptedException {
for (MucMessageInterceptor interceptor : messageInterceptors) { for (MucMessageInterceptor interceptor : messageInterceptors) {
interceptor.intercept(messageBuilder, this); interceptor.intercept(messageBuilder, this);
} }
Message message = messageBuilder.to(room).ofType(Message.Type.groupchat).build(); Message message = messageBuilder.to(room).ofType(Message.Type.groupchat).build();
connection.sendStanza(message); connection.sendStanza(message);
return message;
} }
/** /**