From e1fd11775c7d275dd57d7d9202e88ac5173bbeef Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Wed, 4 Oct 2023 15:43:31 +0200 Subject: Check XmppStream against null Most of the calls to stream_interactor.get_stream(account) were already doing null checks, but there were still some missing. --- libdino/src/service/blocking_manager.vala | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'libdino/src/service/blocking_manager.vala') diff --git a/libdino/src/service/blocking_manager.vala b/libdino/src/service/blocking_manager.vala index aa07f990..4e26b001 100644 --- a/libdino/src/service/blocking_manager.vala +++ b/libdino/src/service/blocking_manager.vala @@ -21,22 +21,26 @@ public class BlockingManager : StreamInteractionModule, Object { } public bool is_blocked(Account account, Jid jid) { - XmppStream stream = stream_interactor.get_stream(account); + XmppStream? stream = stream_interactor.get_stream(account); return stream != null && stream.get_module(Xmpp.Xep.BlockingCommand.Module.IDENTITY).is_blocked(stream, jid.to_string()); } public void block(Account account, Jid jid) { - XmppStream stream = stream_interactor.get_stream(account); - stream.get_module(Xmpp.Xep.BlockingCommand.Module.IDENTITY).block(stream, { jid.to_string() }); + XmppStream? stream = stream_interactor.get_stream(account); + if (stream != null) { + stream.get_module(Xmpp.Xep.BlockingCommand.Module.IDENTITY).block(stream, { jid.to_string() }); + } } public void unblock(Account account, Jid jid) { - XmppStream stream = stream_interactor.get_stream(account); - stream.get_module(Xmpp.Xep.BlockingCommand.Module.IDENTITY).unblock(stream, { jid.to_string() }); + XmppStream? stream = stream_interactor.get_stream(account); + if (stream != null) { + stream.get_module(Xmpp.Xep.BlockingCommand.Module.IDENTITY).unblock(stream, { jid.to_string() }); + } } public bool is_supported(Account account) { - XmppStream stream = stream_interactor.get_stream(account); + XmppStream? stream = stream_interactor.get_stream(account); return stream != null && stream.get_module(Xmpp.Xep.BlockingCommand.Module.IDENTITY).is_supported(stream); } } -- cgit v1.2.3