From f92c717e32bdb9f26f2e50704ce1c8eb9ba1064b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20B=C3=BCchel?= Date: Wed, 17 Mar 2021 00:05:29 +0100 Subject: [PATCH] SEBWIN-449: Implemented workaround due to webcam and microphone access issue when using data URI for proctoring content. --- SafeExamBrowser.Client/CompositionRoot.cs | 2 +- .../Operations/ProctoringOperation.cs | 3 --- SafeExamBrowser.Proctoring/JitsiMeet/index.html | 8 +++++++- SafeExamBrowser.Proctoring/ProctoringControl.cs | 1 + .../ProctoringController.cs | 16 ++++++++++++++-- .../SafeExamBrowser.Proctoring.csproj | 8 ++++++++ .../IFileSystem.cs | 5 +++++ SafeExamBrowser.SystemComponents/FileSystem.cs | 5 +++++ .../Windows/ProctoringWindow.xaml | 3 +-- .../Windows/ProctoringWindow.xaml.cs | 2 ++ 10 files changed, 44 insertions(+), 9 deletions(-) diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs index 3c0b045e..9346b9c4 100644 --- a/SafeExamBrowser.Client/CompositionRoot.cs +++ b/SafeExamBrowser.Client/CompositionRoot.cs @@ -249,7 +249,7 @@ namespace SafeExamBrowser.Client private IOperation BuildProctoringOperation() { - var controller = new ProctoringController(ModuleLogger(nameof(ProctoringController)), uiFactory); + var controller = new ProctoringController(context.AppConfig, new FileSystem(), ModuleLogger(nameof(ProctoringController)), uiFactory); var operation = new ProctoringOperation(context, logger, controller); context.ProctoringController = controller; diff --git a/SafeExamBrowser.Client/Operations/ProctoringOperation.cs b/SafeExamBrowser.Client/Operations/ProctoringOperation.cs index 802cac39..598fb3b1 100644 --- a/SafeExamBrowser.Client/Operations/ProctoringOperation.cs +++ b/SafeExamBrowser.Client/Operations/ProctoringOperation.cs @@ -30,9 +30,6 @@ namespace SafeExamBrowser.Client.Operations public override OperationResult Perform() { - // TODO - Context.Settings.Proctoring.Enabled = true; - if (Context.Settings.Proctoring.Enabled) { logger.Info("Initializing proctoring..."); diff --git a/SafeExamBrowser.Proctoring/JitsiMeet/index.html b/SafeExamBrowser.Proctoring/JitsiMeet/index.html index 5fc8af18..94532f2e 100644 --- a/SafeExamBrowser.Proctoring/JitsiMeet/index.html +++ b/SafeExamBrowser.Proctoring/JitsiMeet/index.html @@ -2,12 +2,18 @@ - +