Merge cb0f15b into f5e1a11

ssc-sp · Oct 12, 2023 · 4d490b4 · 4d490b4
2 parents f5e1a11 + cb0f15b
commit 4d490b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Desktop/Desktop.Uploader/SpeedTestPage.xaml.cs b/Desktop/Desktop.Uploader/SpeedTestPage.xaml.cs
@@ -38,8 +38,11 @@ private async void StartSpeedTestBtn_Clicked(object sender, EventArgs e)
             speedTestResults.DownloadSpeedMpbs = result.DownloadSpeed;
             Preferences.Set(nameof(result.UploadSpeed), result.UploadSpeed);
             Preferences.Set(nameof(result.DownloadSpeed), result.DownloadSpeed);
+            //SpeedTestResultLb.Text = $"{AppResources.Download} {result.DownloadSpeed:0.#} {result.SpeedUnit} / {AppResources.Upload} {result.UploadSpeed:0.#} {result.SpeedUnit}";
+            SpeedTestResultLb.Text = $"{AppResources.Upload} {result.UploadSpeed:0.#} {result.SpeedUnit}";
+
+
             //SpeedTestResultLb.Text = $"Download: {result.DownloadSpeed:0.#} {result.SpeedUnit} / Upload: {result.UploadSpeed:0.#} {result.SpeedUnit}";
-            SpeedTestResultLb.Text = $"{AppResources.Download} {result.DownloadSpeed:0.#} {result.SpeedUnit} / {AppResources.Upload} {result.UploadSpeed:0.#} {result.SpeedUnit}";
             //SpeedTestResultLb.Text = $"Upload: {result.UploadSpeed:0.#} {result.SpeedUnit}";
             //var result = await speedTestClient.TestSpeedAsync(SpeedUnit.Mbps);
             //(Application.Current as App).Context.UploadSpeedMpbs = result.UploadSpeed;

diff --git a/Desktop/Desktop.Uploader/UploadPage.xaml.cs b/Desktop/Desktop.Uploader/UploadPage.xaml.cs
@@ -128,6 +128,11 @@ private async void AddfileBtn_Clicked(object sender, EventArgs e)
         }
 
         private async void OpenWSBtn_Clicked(object sender, EventArgs e)
+        {
+            await OpenBrowserStorage();
+        }
+
+        private async Task OpenBrowserStorage()
         {
             try
             {
@@ -139,6 +144,7 @@ private async void OpenWSBtn_Clicked(object sender, EventArgs e)
                 // An unexpected error occurred. No browser may be installed on the device.
             }
         }
+
         public string StorageURL { get; init; }
 
         //private async void OpenWSBtn_Clicked(object sender, EventArgs e)
@@ -196,6 +202,7 @@ private async void UploadBtn_Clicked(object sender, EventArgs e)
                     item.Status = "Failed";
                 await UpdateFileLayout();
             }
+            await OpenBrowserStorage();
             UploadBtn.IsVisible = true;
             UploadProgressBar.IsVisible = false;
             LbUploadStatus.IsVisible = false;