diff options
| author | fiaxh <git@lightrise.org> | 2019-02-13 16:13:37 +0100 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2019-02-13 16:14:16 +0100 |
| commit | d668e0158df40e1bb1ea00ab72fac9d0e95e8bd9 (patch) | |
| tree | bee26f616b6696c053f23200547e82c3c281a900 /libdino | |
| parent | 6613f3f05a548bb3b91d03becbaa694379ecdde4 (diff) | |
| download | dino-d668e0158df40e1bb1ea00ab72fac9d0e95e8bd9.tar.gz dino-d668e0158df40e1bb1ea00ab72fac9d0e95e8bd9.zip | |
Fix runtime criticals (and compiler warnings)
fixes #520
Diffstat (limited to 'libdino')
| -rw-r--r-- | libdino/src/entity/conversation.vala | 4 | ||||
| -rw-r--r-- | libdino/src/service/connection_manager.vala | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libdino/src/entity/conversation.vala b/libdino/src/entity/conversation.vala index 585db07e..145dc977 100644 --- a/libdino/src/entity/conversation.vala +++ b/libdino/src/entity/conversation.vala @@ -105,10 +105,12 @@ public class Conversation : Object { Xmpp.XmppStream? stream = stream_interactor.get_stream(account); if (!Application.get_default().settings.notifications) return NotifySetting.OFF; if (type_ == Type.GROUPCHAT) { - Xmpp.Xep.Muc.Flag flag = stream.get_flag(Xmpp.Xep.Muc.Flag.IDENTITY); + Xmpp.Xep.Muc.Flag? flag = stream.get_flag(Xmpp.Xep.Muc.Flag.IDENTITY); if (flag != null) { bool members_only = flag.has_room_feature(counterpart.bare_jid, Xmpp.Xep.Muc.Feature.MEMBERS_ONLY); return members_only ? NotifySetting.ON : NotifySetting.HIGHLIGHT; + } else { + return NotifySetting.OFF; } } return NotifySetting.ON; diff --git a/libdino/src/service/connection_manager.vala b/libdino/src/service/connection_manager.vala index 977fc732..ad846ba2 100644 --- a/libdino/src/service/connection_manager.vala +++ b/libdino/src/service/connection_manager.vala @@ -232,7 +232,7 @@ public class ConnectionManager : Object { private void check_reconnect(Account account) { bool acked = false; - DateTime? last_activity_was = connections[account].last_activity != null ? connections[account].last_activity : null; + DateTime? last_activity_was = connections[account].last_activity; XmppStream stream = connections[account].stream; stream.get_module(Xep.Ping.Module.IDENTITY).send_ping(stream, account.bare_jid.domain_jid, () => { |