anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

libdino: do not process message twice

Browse source
This commit is contained in:
Marvin W 2017-05-02 23:21:00 +02:00
parent fbe198dd5c
commit e44cad1b92
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libdino/src/service/message_processor.vala
View file

@ -65,8 +65,6 @@ public class MessageProcessor : StreamInteractionModule, Object {
Entities.Message new_message = create_in_message(account, message); Entities.Message new_message = create_in_message(account, message);
determine_message_type(account, message, new_message); determine_message_type(account, message, new_message);
Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation_for_message(new_message);
if (conversation != null) process_message(new_message, message);
} }
private Entities.Message create_in_message(Account account, Xmpp.Message.Stanza message) { private Entities.Message create_in_message(Account account, Xmpp.Message.Stanza message) {
@ -131,6 +129,7 @@ public class MessageProcessor : StreamInteractionModule, Object {
} else if (conversation.type_ == Conversation.Type.GROUPCHAT) { } else if (conversation.type_ == Conversation.Type.GROUPCHAT) {
message.type_ = Entities.Message.Type.GROUPCHAT_PM; message.type_ = Entities.Message.Type.GROUPCHAT_PM;
} }
process_message(message, message_stanza);
} else { } else {
Core.XmppStream stream = stream_interactor.get_stream(account); Core.XmppStream stream = stream_interactor.get_stream(account);
if (stream != null) stream.get_module(Xep.ServiceDiscovery.Module.IDENTITY).get_entity_categories(stream, message.counterpart.bare_jid.to_string(), (stream, identities) => { if (stream != null) stream.get_module(Xep.ServiceDiscovery.Module.IDENTITY).get_entity_categories(stream, message.counterpart.bare_jid.to_string(), (stream, identities) => {
@ -145,8 +144,8 @@ public class MessageProcessor : StreamInteractionModule, Object {
} else { } else {
message.type_ = Entities.Message.Type.CHAT; message.type_ = Entities.Message.Type.CHAT;
} }
process_message(message, message_stanza);
} }
process_message(message, message_stanza);
}); });
} }
} }