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

SEBWIN-325: Only update the favicon if it really exists.

Browse source
This commit is contained in:
dbuechel 2019-05-08 13:53:38 +02:00
parent 63fc6b75c1
commit 8656363a7a
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
SafeExamBrowser.Browser/BrowserApplicationInstance.cs
View file

@ -7,6 +7,7 @@
*/ */
using System; using System;
using System.Net.Http;
using SafeExamBrowser.Browser.Events; using SafeExamBrowser.Browser.Events;
using SafeExamBrowser.Browser.Handlers; using SafeExamBrowser.Browser.Handlers;
using SafeExamBrowser.Contracts.Applications; using SafeExamBrowser.Contracts.Applications;
@ -28,6 +29,7 @@ namespace SafeExamBrowser.Browser
private AppConfig appConfig; private AppConfig appConfig;
private IBrowserControl control; private IBrowserControl control;
private IBrowserWindow window; private IBrowserWindow window;
private HttpClient httpClient;
private bool isMainInstance; private bool isMainInstance;
private IMessageBox messageBox; private IMessageBox messageBox;
private IModuleLogger logger; private IModuleLogger logger;
@ -64,6 +66,7 @@ namespace SafeExamBrowser.Browser
{ {
this.appConfig = appConfig; this.appConfig = appConfig;
this.Id = id; this.Id = id;
this.httpClient = new HttpClient();
this.isMainInstance = isMainInstance; this.isMainInstance = isMainInstance;
this.messageBox = messageBox; this.messageBox = messageBox;
this.logger = logger; this.logger = logger;
@ -133,10 +136,17 @@ namespace SafeExamBrowser.Browser
private void DisplayHandler_FaviconChanged(string uri) private void DisplayHandler_FaviconChanged(string uri)
{ {
var icon = new BrowserIconResource(uri); var request = new HttpRequestMessage(HttpMethod.Head, uri);
var response = httpClient.SendAsync(request).ContinueWith(task =>
{
if (task.IsCompleted && task.Result.IsSuccessStatusCode)
{
var icon = new BrowserIconResource(uri);
IconChanged?.Invoke(icon); IconChanged?.Invoke(icon);
window.UpdateIcon(icon); window.UpdateIcon(icon);
}
});
} }
private void DownloadHandler_ConfigurationDownloadRequested(string fileName, DownloadEventArgs args) private void DownloadHandler_ConfigurationDownloadRequested(string fileName, DownloadEventArgs args)

1
SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj
View file

@ -59,6 +59,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
</ItemGroup> </ItemGroup>