diff options
| author | Marvin W <git@larma.de> | 2017-03-15 17:23:13 +0100 |
|---|---|---|
| committer | Marvin W <git@larma.de> | 2017-03-15 17:23:13 +0100 |
| commit | 5038db063ec3981385dd68a3069e8edd0b52075d (patch) | |
| tree | 0c2309518a8e20dd47c00126fe6da70eb2041f93 /libdino/src | |
| parent | 27afc2164f31f40e79606c72005277d730c1f005 (diff) | |
| download | dino-5038db063ec3981385dd68a3069e8edd0b52075d.tar.gz dino-5038db063ec3981385dd68a3069e8edd0b52075d.zip | |
omemo plugin: improve session bootstrapping
Diffstat (limited to 'libdino/src')
| -rw-r--r-- | libdino/src/service/muc_manager.vala | 3 | ||||
| -rw-r--r-- | libdino/src/service/presence_manager.vala | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libdino/src/service/muc_manager.vala b/libdino/src/service/muc_manager.vala index 589f26d7..17a6d975 100644 --- a/libdino/src/service/muc_manager.vala +++ b/libdino/src/service/muc_manager.vala @@ -130,7 +130,8 @@ public class MucManager : StreamInteractionModule, Object { public string? get_nick(Jid jid, Account account) { Core.XmppStream? stream = stream_interactor.get_stream(account); if (stream != null) { - return Xep.Muc.Flag.get_flag(stream).get_muc_nick(jid.bare_jid.to_string()); + Xep.Muc.Flag? flag = Xep.Muc.Flag.get_flag(stream); + if (flag != null) return flag.get_muc_nick(jid.bare_jid.to_string()); } return null; } diff --git a/libdino/src/service/presence_manager.vala b/libdino/src/service/presence_manager.vala index 6a8d77aa..7ff74e1a 100644 --- a/libdino/src/service/presence_manager.vala +++ b/libdino/src/service/presence_manager.vala @@ -42,7 +42,9 @@ public class PresenceManager : StreamInteractionModule, Object { public ArrayList<Jid>? get_full_jids(Jid jid, Account account) { Core.XmppStream? stream = stream_interactor.get_stream(account); if (stream != null) { - Gee.List<string> resources = Xmpp.Presence.Flag.get_flag(stream).get_resources(jid.bare_jid.to_string()); + Xmpp.Presence.Flag flag = Xmpp.Presence.Flag.get_flag(stream); + if (flag == null) return null; + Gee.List<string> resources = flag.get_resources(jid.bare_jid.to_string()); if (resources == null) { return null; } |