Skip to content

Commit d771283

Browse files
committed
Update AppUpdateSideloadService.cs
1 parent b6e9eb1 commit d771283

File tree

1 file changed

+18
-39
lines changed

1 file changed

+18
-39
lines changed

src/Files.App/Services/App/AppUpdateSideloadService.cs

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -138,51 +138,30 @@ public async Task CheckAndUpdateFilesLauncherAsync()
138138

139139
if (File.Exists(destHashFilePath))
140140
{
141-
try
142-
{
143-
await using var srcStream = (await srcHashFile.OpenReadAsync().AsTask().ConfigureAwait(false)).AsStream();
144-
await using var destStream = File.OpenRead(destHashFilePath);
145-
hashEqual = HashEqual(srcStream, destStream);
146-
}
147-
catch (COMException ex)
148-
{
149-
Logger?.LogWarning(ex, "Failed to compare hash files");
150-
return;
151-
}
152-
catch (IOException ex)
153-
{
154-
Logger?.LogWarning(ex, "IO error while reading hash files");
155-
return;
156-
}
141+
await using var srcStream = (await srcHashFile.OpenReadAsync().AsTask().ConfigureAwait(false)).AsStream();
142+
await using var destStream = File.OpenRead(destHashFilePath);
143+
hashEqual = HashEqual(srcStream, destStream);
157144
}
158145

159146
if (!hashEqual)
160147
{
161-
try
162-
{
163-
var srcExeFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/FilesOpenDialog/Files.App.Launcher.exe"))
164-
.AsTask().ConfigureAwait(false);
165-
var destFolder = await StorageFolder.GetFolderFromPathAsync(destFolderPath).AsTask().ConfigureAwait(false);
166-
167-
await srcExeFile.CopyAsync(destFolder, "Files.App.Launcher.exe", NameCollisionOption.ReplaceExisting)
168-
.AsTask().ConfigureAwait(false);
169-
await srcHashFile.CopyAsync(destFolder, "Files.App.Launcher.exe.sha256", NameCollisionOption.ReplaceExisting)
170-
.AsTask().ConfigureAwait(false);
171-
172-
Logger?.LogInformation("Files.App.Launcher updated.");
173-
}
174-
catch (COMException ex)
175-
{
176-
Logger?.LogError(ex, ex.Message);
177-
return;
178-
}
179-
catch (UnauthorizedAccessException ex)
180-
{
181-
Logger?.LogError(ex, ex.Message);
182-
return;
183-
}
148+
var srcExeFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/FilesOpenDialog/Files.App.Launcher.exe"))
149+
.AsTask().ConfigureAwait(false);
150+
var destFolder = await StorageFolder.GetFolderFromPathAsync(destFolderPath).AsTask().ConfigureAwait(false);
151+
152+
await srcExeFile.CopyAsync(destFolder, "Files.App.Launcher.exe", NameCollisionOption.ReplaceExisting)
153+
.AsTask().ConfigureAwait(false);
154+
await srcHashFile.CopyAsync(destFolder, "Files.App.Launcher.exe.sha256", NameCollisionOption.ReplaceExisting)
155+
.AsTask().ConfigureAwait(false);
156+
157+
Logger?.LogInformation("Files.App.Launcher updated.");
184158
}
185159
}
160+
catch (COMException ex)
161+
{
162+
Logger?.LogError(ex, ex.Message);
163+
return;
164+
}
186165
catch (Exception ex)
187166
{
188167
Logger?.LogError(ex, ex.Message);

0 commit comments

Comments
 (0)