Make \OCA\Mail\Model\RepliedMessageData nullable, not its properties

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/Listener/FlagRepliedMessageListener.php b/lib/Listener/FlagRepliedMessageListener.php
index 280eeb3d1..eb2c3b73d 100644
--- a/lib/Listener/FlagRepliedMessageListener.php
+++ b/lib/Listener/FlagRepliedMessageListener.php
@@ -27,6 +27,7 @@ use Horde_Imap_Client;
 use Horde_Imap_Client_Exception;
 use OCA\Mail\Db\MailboxMapper;
 use OCA\Mail\Events\MessageSentEvent;
+use OCA\Mail\Exception\ServiceException;
 use OCA\Mail\IMAP\IMAPClientFactory;
 use OCA\Mail\IMAP\MessageMapper;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -60,7 +61,7 @@ class FlagRepliedMessageListener implements IEventListener {
 	}
 
 	public function handle(Event $event): void {
-		if (!($event instanceof MessageSentEvent) || !$event->getRepliedMessageData()->isReply()) {
+		if (!($event instanceof MessageSentEvent) || $event->getRepliedMessageData() === null) {
 			return;
 		}
 
@@ -69,7 +70,7 @@ class FlagRepliedMessageListener implements IEventListener {
 				$event->getAccount(),
 				$event->getRepliedMessageData()->getFolderId()
 			);
-		} catch (DoesNotExistException $e) {
+		} catch (DoesNotExistException|ServiceException $e) {
 			$this->logger->logException($e, [
 				'message' => 'Could not flag the message in reply to',
 				'level' => ILogger::WARN,