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

Fix bug where OMEMO not avaiable with a newly added contact

Browse source
This commit is contained in:
Samuel Hand 2018-08-05 01:26:36 +01:00
parent ed3b36d0de
commit 0bfab9d1d9
4 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ public class PresenceManager : StreamInteractionModule, Object {
public signal void show_received(Show show, Jid jid, Account account);
public signal void received_subscription_request(Jid jid, Account account);
public signal void received_subscription_approval(Jid jid, Account account);
public signal void mutual_subscription(Jid jid, Account account);
private StreamInteractor stream_interactor;
private HashMap<Jid, HashMap<Jid, ArrayList<Show>>> shows = new HashMap<Jid, HashMap<Jid, ArrayList<Show>>>(Jid.hash_bare_func, Jid.equals_bare_func);
@ -98,6 +99,9 @@ public class PresenceManager : StreamInteractionModule, Object {
stream_interactor.module_manager.get_module(account, Presence.Module.IDENTITY).received_subscription_approval.connect((stream, jid) => {
received_subscription_approval(jid, account);
});
stream_interactor.module_manager.get_module(account, Presence.Module.IDENTITY).mutual_subscription.connect((stream, jid) => {
mutual_subscription(jid, account);
});
}
private void on_received_available_show(Account account, Jid jid, string show) {

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

@ -71,6 +71,7 @@ public class Manager : StreamInteractionModule, Object {
stream_interactor.account_added.connect(on_account_added);
stream_interactor.get_module(MessageProcessor.IDENTITY).received_pipeline.connect(received_message_listener);
stream_interactor.get_module(MessageProcessor.IDENTITY).pre_message_send.connect(on_pre_message_send);
stream_interactor.get_module(PresenceManager.IDENTITY).mutual_subscription.connect(on_mutual_subscription);
}
private class ReceivedMessageListener : MessageListener {
@ -171,6 +172,13 @@ public class Manager : StreamInteractionModule, Object {
}
}
private void on_mutual_subscription(Jid jid, Account account) {
XmppStream? stream = stream_interactor.get_stream(account);
if(stream == null) return;
stream_interactor.module_manager.get_module(account, StreamModule.IDENTITY).request_user_devicelist((!)stream, jid);
}
private void on_account_added(Account account) {
stream_interactor.module_manager.get_module(account, StreamModule.IDENTITY).store_created.connect((store) => on_store_created(account, store));
stream_interactor.module_manager.get_module(account, StreamModule.IDENTITY).device_list_loaded.connect((jid, devices) => on_device_list_loaded(account, jid, devices));
@ -341,7 +349,6 @@ public class Manager : StreamInteractionModule, Object {
if (flag.has_room_feature(conversation.counterpart, Xep.Muc.Feature.NON_ANONYMOUS) && flag.has_room_feature(conversation.counterpart, Xep.Muc.Feature.MEMBERS_ONLY)) {
foreach(Jid jid in stream_interactor.get_module(MucManager.IDENTITY).get_offline_members(conversation.counterpart, conversation.account)) {
if (!trust_manager.is_known_address(conversation.account, jid.bare_jid)) {
module.request_user_devicelist(stream, jid.bare_jid);
return false;
}
}
@ -349,11 +356,8 @@ public class Manager : StreamInteractionModule, Object {
} else {
return false;
}
} else if (!trust_manager.is_known_address(conversation.account, conversation.counterpart.bare_jid)) {
module.request_user_devicelist(stream, conversation.counterpart.bare_jid);
return false;
}
return true;
return trust_manager.is_known_address(conversation.account, conversation.counterpart.bare_jid);
}
public static void start(StreamInteractor stream_interactor, Database db) {

2
xmpp-vala/src/module/presence/flag.vala
View file

@ -57,4 +57,4 @@ public class Flag : XmppStreamFlag {
}
}
}
}

16
xmpp-vala/src/module/presence/module.vala
View file

@ -1,3 +1,5 @@
using Gee;
namespace Xmpp.Presence {
private const string NS_URI = "jabber:client";
@ -13,9 +15,13 @@ namespace Xmpp.Presence {
public signal void received_subscription_request(XmppStream stream, Jid jid);
public signal void received_subscription_approval(XmppStream stream, Jid jid);
public signal void received_unsubscription(XmppStream stream, Jid jid);
public signal void mutual_subscription(XmppStream stream, Jid jid);
public bool available_resource = true;
private Gee.List<Jid> subscriptions = new ArrayList<Jid>(Jid.equals_bare_func);
private Gee.List<Jid> subscribers = new ArrayList<Jid>(Jid.equals_bare_func);
public void request_subscription(XmppStream stream, Jid bare_jid) {
Presence.Stanza presence = new Presence.Stanza();
presence.to = bare_jid;
@ -28,6 +34,8 @@ namespace Xmpp.Presence {
presence.to = bare_jid;
presence.type_ = Presence.Stanza.TYPE_SUBSCRIBED;
send_presence(stream, presence);
subscribers.add(bare_jid);
if (subscriptions.contains(bare_jid)) mutual_subscription(stream, bare_jid);
}
public void deny_subscription(XmppStream stream, Jid bare_jid) {
@ -39,6 +47,7 @@ namespace Xmpp.Presence {
presence.to = bare_jid;
presence.type_ = Presence.Stanza.TYPE_UNSUBSCRIBED;
send_presence(stream, presence);
subscribers.remove(bare_jid);
}
public void unsubscribe(XmppStream stream, Jid bare_jid) {
@ -46,6 +55,7 @@ namespace Xmpp.Presence {
presence.to = bare_jid;
presence.type_ = Presence.Stanza.TYPE_UNSUBSCRIBE;
send_presence(stream, presence);
subscriptions.remove(bare_jid);
}
public void send_presence(XmppStream stream, Presence.Stanza presence) {
@ -82,10 +92,16 @@ namespace Xmpp.Presence {
break;
case Presence.Stanza.TYPE_SUBSCRIBED:
received_subscription_approval(stream, presence.from);
subscriptions.add(presence.from);
if (subscribers.contains(presence.from)) mutual_subscription(stream, presence.from);
break;
case Presence.Stanza.TYPE_UNSUBSCRIBE:
stream.get_flag(Flag.IDENTITY).remove_presence(presence.from);
received_unsubscription(stream, presence.from);
subscribers.remove(presence.from);
break;
case Presence.Stanza.TYPE_UNSUBSCRIBED:
subscriptions.remove(presence.from);
break;
}
}