Skip to content

Commit

Permalink
refa (FileUploader.UploadAsync()): trivial neutral renames for the sa…
Browse files Browse the repository at this point in the history
…ke of readability
  • Loading branch information
ksidirop-laerdal committed Jul 9, 2024
1 parent 39e4b13 commit d4119ba
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions Laerdal.McuMgr/Shared/FileUploader/FileUploader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ public async Task UploadAsync<TData>(
var taskCompletionSource = new TaskCompletionSource<bool>(state: false);
try
{
Cancelled += UploadAsyncOnCancelled;
FileUploaded += UploadAsyncOnFileUploaded;
StateChanged += UploadAsyncOnStateChanged;
FatalErrorOccurred += UploadAsyncOnFatalErrorOccurred;
Cancelled += FileUploader_Cancelled_;
FileUploaded += FileUploader_FileUploaded_;
StateChanged += FileUploader_StateChanged_;
FatalErrorOccurred += FileUploader_FatalErrorOccurred_;

var verdict = BeginUpload(remoteFilePath, dataArray); //00 dont use task.run here for now
if (verdict != EFileUploaderVerdict.Success)
Expand Down Expand Up @@ -271,28 +271,28 @@ ex is not ArgumentException //10 wops probably missing native lib symbols!
}
finally
{
Cancelled -= UploadAsyncOnCancelled;
FileUploaded -= UploadAsyncOnFileUploaded;
StateChanged -= UploadAsyncOnStateChanged;
FatalErrorOccurred -= UploadAsyncOnFatalErrorOccurred;
Cancelled -= FileUploader_Cancelled_;
FileUploaded -= FileUploader_FileUploaded_;
StateChanged -= FileUploader_StateChanged_;
FatalErrorOccurred -= FileUploader_FatalErrorOccurred_;

CleanupResourcesOfLastUpload(); //vital
}

void UploadAsyncOnCancelled(object sender, CancelledEventArgs ea)
void FileUploader_Cancelled_(object _, CancelledEventArgs ea_)
{
taskCompletionSource.TrySetException(new UploadCancelledException());
}

void UploadAsyncOnFileUploaded(object sender, FileUploadedEventArgs ea)
void FileUploader_FileUploaded_(object _, FileUploadedEventArgs ea_)
{
taskCompletionSource.TrySetResult(true);
}

// ReSharper disable AccessToModifiedClosure
void UploadAsyncOnStateChanged(object sender, StateChangedEventArgs ea)
void FileUploader_StateChanged_(object _, StateChangedEventArgs ea_)
{
switch (ea.NewState)
switch (ea_.NewState)
{
case EFileUploaderState.Complete:
//taskCompletionSource.TrySetResult(true); //dont we want to wait for the FileUploaded event
Expand Down Expand Up @@ -327,7 +327,7 @@ void UploadAsyncOnStateChanged(object sender, StateChangedEventArgs ea)
// getting called right above but if that takes too long we give the killing blow by calling OnCancelled() manually here
}

void UploadAsyncOnFatalErrorOccurred(object sender, FatalErrorOccurredEventArgs ea)
void FileUploader_FatalErrorOccurred_(object sender, FatalErrorOccurredEventArgs ea)
{
var isAboutUnauthorized = ea.ErrorCode == EMcuMgrErrorCode.AccessDenied;
if (isAboutUnauthorized)
Expand Down

0 comments on commit d4119ba

Please sign in to comment.