mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

fix sending room invitation multiple times

Browse source
This commit is contained in:
Arne 2021-12-26 22:45:59 +01:00
parent 33701727f4
commit 73250e09af
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -1,5 +1,8 @@
package eu.siacs.conversations.parser;
import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY;
import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY_OLD;
import android.util.Log;
import android.util.Pair;
@ -565,7 +568,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
} else if (invite.direct && (mucUserElement != null || invite.inviter == null || mXmppConnectionService.isMuc(account, invite.inviter))) {
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": ignoring direct invite to " + invite.jid + " because it was received in MUC");
} else {
invite.execute(account);
invite.execute(account, packet.getBody());
return;
}
}
@ -1229,6 +1232,10 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
}
public boolean execute(Account account) {
return execute(account, null);
}
public boolean execute(Account account, LocalizedContent body) {
if (jid != null) {
Conversation conversation = mXmppConnectionService.findOrCreateConversation(account, jid, true, false);
if (conversation.getMucOptions().online()) {
@ -1240,7 +1247,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
final Contact contact = inviter != null ? account.getRoster().getContactFromContactList(inviter) : null;
mXmppConnectionService.joinMuc(conversation, contact != null && contact.mutualPresenceSubscription());
mXmppConnectionService.updateConversationUi();
mXmppConnectionService.showInvitationNotification(conversation, contact);
if (body != null) {
mXmppConnectionService.showInvitationNotification(conversation, contact, body);
}
}
return true;
}

4
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -5363,8 +5363,8 @@ public class XmppConnectionService extends Service {
}
}
public void showInvitationNotification(final Conversation conversation, final Contact contact) {
final String messageId = "MUC_INVITATION_" + System.currentTimeMillis();
public void showInvitationNotification(final Conversation conversation, final Contact contact, final LocalizedContent id) {
final String messageId = "MUC_INVITATION_" + id;
final Message message = new Message(
conversation,
Message.STATUS_RECEIVED,