From eab0a9059df1eb1972a980b7d757e4bc42ec1184 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 12 Mar 2018 11:44:24 +0100 Subject: [PATCH] Make the methods public so the callables work Signed-off-by: Joas Schilling --- lib/BackgroundJob/RemoveEmptyRooms.php | 2 +- lib/BackgroundJob/ResetInCallFlags.php | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/BackgroundJob/RemoveEmptyRooms.php b/lib/BackgroundJob/RemoveEmptyRooms.php index 246762b39..203697488 100644 --- a/lib/BackgroundJob/RemoveEmptyRooms.php +++ b/lib/BackgroundJob/RemoveEmptyRooms.php @@ -60,7 +60,7 @@ class RemoveEmptyRooms extends TimedJob { } } - protected function callback(Room $room) { + public function callback(Room $room) { if ($room->getType() === Room::ONE_TO_ONE_CALL && $room->getNumberOfParticipants(false) <= 1) { $room->deleteRoom(); $this->numDeletedRooms++; diff --git a/lib/BackgroundJob/ResetInCallFlags.php b/lib/BackgroundJob/ResetInCallFlags.php index dbff79a3a..29006981d 100644 --- a/lib/BackgroundJob/ResetInCallFlags.php +++ b/lib/BackgroundJob/ResetInCallFlags.php @@ -26,7 +26,6 @@ use OCA\Spreed\Exceptions\ParticipantNotFoundException; use OCA\Spreed\Manager; use OCA\Spreed\Room; use OCP\AppFramework\Utility\ITimeFactory; -use OCP\ILogger; /** * Class ResetInCallFlags @@ -54,7 +53,7 @@ class ResetInCallFlags extends TimedJob { $this->manager->forAllRooms([$this, 'callback']); } - protected function callback(Room $room) { + public function callback(Room $room) { if (!$room->hasSessionsInCall()) { return; } @@ -67,8 +66,11 @@ class ResetInCallFlags extends TimedJob { continue; } - if ($participant->isInCall() && $participant->getLastPing() < $this->timeout) { - $room->changeInCall($session, false); + if ($participant->getLastPing() < $this->timeout) { + // TODO reset session too + if ($participant->isInCall()) { + $room->changeInCall($session, false); + } } } }