Catch exceptions during logout cleanup

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

1 files changed, 11 insertions, 5 deletions

diff --git a/lib/Listener.php b/lib/Listener.php
index c4235d945..d9ba0e3e7 100644
--- a/lib/Listener.php
+++ b/lib/Listener.php
@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace OCA\Talk;
 
+use OCA\Talk\Exceptions\ParticipantNotFoundException;
+use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IUser;
 use OCP\IUserManager;
@@ -92,12 +94,16 @@ class Listener {
 		/** @var string[] $sessionIds */
 		$sessionIds = $this->talkSession->getAllActiveSessions();
 		foreach ($sessionIds as $sessionId) {
-			$room = $this->manager->getRoomForSession($user->getUID(), $sessionId);
-			$participant = $room->getParticipant($user->getUID());
-			if ($participant->getInCallFlags() !== Participant::FLAG_DISCONNECTED) {
-				$room->changeInCall($participant, Participant::FLAG_DISCONNECTED);
+			try {
+				$room = $this->manager->getRoomForSession($user->getUID(), $sessionId);
+				$participant = $room->getParticipant($user->getUID());
+				if ($participant->getInCallFlags() !== Participant::FLAG_DISCONNECTED) {
+					$room->changeInCall($participant, Participant::FLAG_DISCONNECTED);
+				}
+				$room->leaveRoom($user->getUID(), $sessionId);
+			} catch (RoomNotFoundException $e) {
+			} catch (ParticipantNotFoundException $e) {
 			}
-			$room->leaveRoom($user->getUID(), $sessionId);
 		}
 	}
 }