Flush and Dispose streams

nearby-sharing · Feb 8, 2024 · 82e6dd2 · 82e6dd2
1 parent 5e8e4c7
commit 82e6dd2
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/ShortDev.Microsoft.ConnectedDevices.NearShare/TransferToken.cs b/ShortDev.Microsoft.ConnectedDevices.NearShare/TransferToken.cs
@@ -93,21 +93,28 @@ public void Cancel()
     ulong _transferedBytes = 0;
     internal void SendProgressEvent(ulong byteTransferDelta)
     {
-        _transferedBytes += byteTransferDelta;
         NearShareProgress progress = new()
         {
-            TransferedBytes = _transferedBytes,
+            TransferedBytes = Interlocked.Add(ref _transferedBytes, byteTransferDelta),
             TotalBytes = TotalBytes,
-            TotalFiles = TotalFiles,
+            TotalFiles = TotalFiles
         };
         IsTransferComplete = progress.TransferedBytes >= progress.TotalBytes;
         _ = Task.Run(() => Progress?.Invoke(progress));
     }
     #endregion
 
     public event Action? Finished;
-    internal void OnFinish()
+    internal async void OnFinish()
     {
-        _ = Task.Run(() => Finished?.Invoke());
+        await Task.WhenAll(_acceptPromise.Task.Result.Select(async stream =>
+        {
+            await stream.FlushAsync();
+
+            stream.Close();
+            stream.Dispose();
+        })).ConfigureAwait(continueOnCapturedContext: false);
+
+        Finished?.Invoke();
     }
 }