Run Maui update on MainThread

ipax77 · Nov 15, 2024 · d2dc387 · d2dc387
1 parent 4d32203
commit d2dc387
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/src/dsstats.maui/dsstats.maui8/Components/Layout/TopRowComponent.razor.cs b/src/dsstats.maui/dsstats.maui8/Components/Layout/TopRowComponent.razor.cs
@@ -125,6 +125,7 @@ public void Dispose()
         dsstatsService.ScanStateChanged -= DssstatsService_ScanStateChanged;
         dsstatsService.DecodeStateChanged -= DssstatsService_DecodeStateChanged;
         NavigationManager.LocationChanged -= NavigationManager_LocationChanged;
+        updateService.UpdateProgress -= UpdateService_UpdateProgress;
     }
 
     public async Task CheckForUpdates(bool init = false)

diff --git a/src/dsstats.maui/dsstats.maui8/Services/StoreUpdateService.cs b/src/dsstats.maui/dsstats.maui8/Services/StoreUpdateService.cs
@@ -54,26 +54,41 @@ public async Task<bool> UpdateApp()
     {
         try
         {
-            var storeContext = StoreContext.GetDefault();
+            var result = await MainThread.InvokeOnMainThreadAsync(async () =>
+            {
+                var storeContext = StoreContext.GetDefault();
+                var availableUpdates = await storeContext.GetAppAndOptionalStorePackageUpdatesAsync();
 
-            var availableUpdates = await storeContext.GetAppAndOptionalStorePackageUpdatesAsync();
-            ArgumentNullException.ThrowIfNull(availableUpdates);
+                if (availableUpdates is null || availableUpdates.Count == 0)
+                {
+                    logger.LogWarning("No updates available.");
+                    return null;
+                }
 
-            var progress = new Progress<StorePackageUpdateStatus>(progress => 
-                OnUpdateProgress(new() { Progress = Convert.ToInt32(progress.PackageDownloadProgress * 100.0) }));
+                var progress = new Progress<StorePackageUpdateStatus>(progress =>
+                    OnUpdateProgress(new() { Progress = Convert.ToInt32(progress.PackageDownloadProgress * 100.0) }));
 
-            var result = await storeContext.RequestDownloadStorePackageUpdatesAsync(availableUpdates)
-                .AsTask(progress);
+                return await storeContext.RequestDownloadStorePackageUpdatesAsync(availableUpdates)
+                    .AsTask(progress);
+            });
+
+            if (result == null)
+                return false;
 
             if (result.OverallState != StorePackageUpdateState.Completed)
             {
                 var failedUpdates = result.StorePackageUpdateStatuses.Where(
                     status => status.PackageUpdateState != StorePackageUpdateState.Completed)
-                .ToList();
+                    .ToList();
 
                 if (failedUpdates.Count > 0)
                 {
-                    logger.LogError("app update failed: {errorlist}", string.Join(", ", failedUpdates.Select(s => s.PackageFamilyName)));
+                    var errorDetails = failedUpdates.Select(s => new
+                    {
+                        PackageFamilyName = s.PackageFamilyName,
+                        Error = s.PackageUpdateState
+                    });
+                    logger.LogError("App update failed for packages: {errorDetails}", string.Join(", ", errorDetails));
                 }
             }
             else
@@ -83,8 +98,9 @@ public async Task<bool> UpdateApp()
         }
         catch (Exception ex)
         {
-            logger.LogError("app update failed: {error}", ex.Message);
+            logger.LogError("App update failed: {error}", ex);
         }
         return false;
     }
+
 }