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

correctly bootstrap omemo when there is no devicelist on server yet + concurrency bug fixes

Browse source
This commit is contained in:
Marvin W 2017-03-13 21:54:12 +01:00
parent 1a4cd2508b
commit 2d6f580c87
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
3 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libdino/src/service/message_manager.vala
View file

@ -85,10 +85,12 @@ public class MessageManager : StreamInteractionModule, Object {
private void send_unsent_messages(Account account) { private void send_unsent_messages(Account account) {
Gee.List<Entities.Message> unsend_messages = db.get_unsend_messages(account); Gee.List<Entities.Message> unsend_messages = db.get_unsend_messages(account);
foreach (Entities.Message message in unsend_messages) { foreach (Entities.Message message in unsend_messages) {
Conversation conversation = ConversationManager.get_instance(stream_interactor).get_conversation(message.counterpart, account); Conversation? conversation = ConversationManager.get_instance(stream_interactor).get_conversation(message.counterpart, account);
if (conversation != null) {
send_xmpp_message(message, conversation, true); send_xmpp_message(message, conversation, true);
} }
} }
}
private void on_message_received(Account account, Xmpp.Message.Stanza message) { private void on_message_received(Account account, Xmpp.Message.Stanza message) {
if (message.body == null) return; if (message.body == null) return;

10
plugins/omemo/src/manager.vala
View file

@ -11,13 +11,14 @@ public class Manager : StreamInteractionModule, Object {
private StreamInteractor stream_interactor; private StreamInteractor stream_interactor;
private Database db; private Database db;
private ArrayList<Entities.Message> to_send_after_devicelist = new ArrayList<Entities.Message>(); private ConcurrentList<Entities.Message> to_send_after_devicelist = new ConcurrentList<Entities.Message>();
private ArrayList<Entities.Message> to_send_after_session = new ArrayList<Entities.Message>(); private ConcurrentList<Entities.Message> to_send_after_session = new ConcurrentList<Entities.Message>();
private Manager(StreamInteractor stream_interactor, Database db) { private Manager(StreamInteractor stream_interactor, Database db) {
this.stream_interactor = stream_interactor; this.stream_interactor = stream_interactor;
this.db = db; this.db = db;
stream_interactor.stream_negotiated.connect(on_stream_negotiated);
stream_interactor.account_added.connect(on_account_added); stream_interactor.account_added.connect(on_account_added);
MessageManager.get_instance(stream_interactor).pre_message_received.connect(on_pre_message_received); MessageManager.get_instance(stream_interactor).pre_message_received.connect(on_pre_message_received);
MessageManager.get_instance(stream_interactor).pre_message_send.connect(on_pre_message_send); MessageManager.get_instance(stream_interactor).pre_message_send.connect(on_pre_message_send);
@ -68,6 +69,11 @@ public class Manager : StreamInteractionModule, Object {
stream_interactor.module_manager.get_module(account, StreamModule.IDENTITY).session_started.connect((jid, device_id) => on_session_started(account, jid)); stream_interactor.module_manager.get_module(account, StreamModule.IDENTITY).session_started.connect((jid, device_id) => on_session_started(account, jid));
} }
private void on_stream_negotiated(Account account) {
Core.XmppStream stream = stream_interactor.get_stream(account);
stream_interactor.module_manager.get_module(account, StreamModule.IDENTITY).request_user_devicelist(stream, account.bare_jid.to_string());
}
private void on_session_started(Account account, string jid) { private void on_session_started(Account account, string jid) {
lock(to_send_after_session) { lock(to_send_after_session) {
Iterator<Entities.Message> iter = to_send_after_session.iterator(); Iterator<Entities.Message> iter = to_send_after_session.iterator();

11
plugins/omemo/src/stream_module.vala
View file

@ -176,8 +176,17 @@ public class StreamModule : XmppStreamModule {
return (string)rarr; return (string)rarr;
} }
public void on_devicelist(XmppStream stream, string jid, string id, StanzaNode node) { public void request_user_devicelist(XmppStream stream, string jid) {
stream.get_module(Pubsub.Module.IDENTITY).request(stream, jid, NODE_DEVICELIST, (stream, jid, id, node, obj) => (obj as StreamModule).on_devicelist(stream, jid, id ?? "", node), this);
}
public void on_devicelist(XmppStream stream, string jid, string id, StanzaNode? node_) {
StanzaNode? node = node_;
if (jid == get_bare_jid(Bind.Flag.get_flag(stream).my_jid) && store.local_registration_id != 0) { if (jid == get_bare_jid(Bind.Flag.get_flag(stream).my_jid) && store.local_registration_id != 0) {
if (node == null) {
node = new StanzaNode.build("list", NS_URI).add_self_xmlns().put_node(new StanzaNode.build("device", NS_URI));
}
lock (device_list_loading) { lock (device_list_loading) {
if (!device_list_loading) { if (!device_list_loading) {
device_list_loading = true; device_list_loading = true;