zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/SafeExamBrowser/seb-win-refactoring

Browse source
This commit is contained in:
Damian Büchel 2020-09-22 16:55:36 +02:00
commit 12c342cc7d
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
SafeExamBrowser.UserInterface.Desktop/Windows/FileSystemDialog.xaml.cs
View file

@ -1,4 +1,4 @@
/* /*
* Copyright (c) 2020 ETH Zürich, Educational Development and Technology (LET) * Copyright (c) 2020 ETH Zürich, Educational Development and Technology (LET)
* *
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
@ -15,6 +15,7 @@ using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using FontAwesome.WPF; using FontAwesome.WPF;
using Microsoft.Win32;
using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog; using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog;
using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows;
@ -288,6 +289,20 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
InitializeFileSystem(); InitializeFileSystem();
} }
private DriveInfo[] GetDrives()
{
var drives = DriveInfo.GetDrives();
int noDrives = (int)Registry.GetValue("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer", "NoDrives", 0);
if (noDrives > 0)
{
return drives.Where(drive => (noDrives & (int)(Math.Pow(2, (int)(drive.RootDirectory.ToString()[0]) - 65))) == 0).ToArray();
}
return drives;
}
private void InitializeFileSystem() private void InitializeFileSystem()
{ {
if (restrictNavigation && !string.IsNullOrEmpty(initialPath)) if (restrictNavigation && !string.IsNullOrEmpty(initialPath))
@ -318,7 +333,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
private void InitializeUnrestricted() private void InitializeUnrestricted()
{ {
foreach (var drive in DriveInfo.GetDrives()) foreach (var drive in GetDrives())
{ {
FileSystem.Items.Add(CreateItem(drive.RootDirectory)); FileSystem.Items.Add(CreateItem(drive.RootDirectory));
} }

17
SafeExamBrowser.UserInterface.Mobile/Windows/FileSystemDialog.xaml.cs
View file

@ -15,6 +15,7 @@ using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using FontAwesome.WPF; using FontAwesome.WPF;
using Microsoft.Win32;
using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog; using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog;
using SafeExamBrowser.UserInterface.Contracts.Windows; using SafeExamBrowser.UserInterface.Contracts.Windows;
@ -288,6 +289,20 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
InitializeFileSystem(); InitializeFileSystem();
} }
private DriveInfo[] GetDrives()
{
var drives = DriveInfo.GetDrives();
int noDrives = (int)Registry.GetValue("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer", "NoDrives", 0);
if (noDrives > 0)
{
return drives.Where(drive => (noDrives & (int)(Math.Pow(2, (int)(drive.RootDirectory.ToString()[0]) - 65))) == 0).ToArray();
}
return drives;
}
private void InitializeFileSystem() private void InitializeFileSystem()
{ {
if (restrictNavigation && !string.IsNullOrEmpty(initialPath)) if (restrictNavigation && !string.IsNullOrEmpty(initialPath))
@ -318,7 +333,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
private void InitializeUnrestricted() private void InitializeUnrestricted()
{ {
foreach (var drive in DriveInfo.GetDrives()) foreach (var drive in GetDrives())
{ {
FileSystem.Items.Add(CreateItem(drive.RootDirectory)); FileSystem.Items.Add(CreateItem(drive.RootDirectory));
} }