Addressed PR comments

microsoft · Apr 9, 2024 · 8db7405 · 8db7405
1 parent caeaad9
commit 8db7405
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/...tion/DevHome.Customization/ViewModels/DevDriveInsights/OptimizeDevDriveDialogViewModel.cs b/...tion/DevHome.Customization/ViewModels/DevDriveInsights/OptimizeDevDriveDialogViewModel.cs
@@ -91,7 +91,7 @@ private async Task BrowseButtonClick(object sender)
         }
     }
 
-    private int MoveDirectory(string sourceDirectory, string targetDirectory)
+    private bool MoveDirectory(string sourceDirectory, string targetDirectory)
     {
         try
         {
@@ -123,13 +123,13 @@ private int MoveDirectory(string sourceDirectory, string targetDirectory)
 
             // Delete the source directory
             Directory.Delete(sourceDirectory, true);
-            return 0;
+            return true;
         }
         catch (Exception ex)
         {
             Log.Error($"Error in MoveDirectory. Error: {ex}");
             TelemetryFactory.Get<ITelemetry>().LogError("DevDriveInsights_PackageCacheMoveDirectory_Error", LogLevel.Critical, new ExceptionEvent(ex.HResult, sourceDirectory));
-            return ex.HResult;
+            return false;
         }
     }
 
@@ -169,7 +169,7 @@ private void DirectoryInputConfirmed()
             // TODO: If chosen folder not a dev drive location, currently we no-op and log the error. Instead we should display the error.
             if (ChosenDirectoryInDevDrive(directoryPath))
             {
-                if (MoveDirectory(ExistingCacheLocation, directoryPath) == 0)
+                if (MoveDirectory(ExistingCacheLocation, directoryPath))
                 {
                     SetEnvironmentVariable(EnvironmentVariableToBeSet, directoryPath);
                     Log.Debug($"Moved cache from {ExistingCacheLocation} to {directoryPath}");

diff --git a/tools/Customization/DevHome.Customization/Views/DevDriveInsightsPage.xaml b/tools/Customization/DevHome.Customization/Views/DevDriveInsightsPage.xaml
@@ -1,20 +1,15 @@
-<Page
-    x:Class="DevHome.Customization.Views.DevDriveInsightsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<Page
+    x:Class="DevHome.Customization.Views.DevDriveInsightsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:behaviors="using:DevHome.Common.Behaviors"
-    xmlns:views="using:DevHome.Customization.Views"
-    behaviors:NavigationViewHeaderBehavior.HeaderTemplate="{StaticResource BreadcrumbBarDataTemplate}"
-    behaviors:NavigationViewHeaderBehavior.HeaderContext="{x:Bind ViewModel}">
-
-    <Grid MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <ScrollView Grid.Row="1" VerticalAlignment="Top">
-            <views:DevDriveInsightsView />
-        </ScrollView>
-    </Grid>
-</Page>
+    xmlns:views="using:DevHome.Customization.Views"
+    behaviors:NavigationViewHeaderBehavior.HeaderTemplate="{StaticResource BreadcrumbBarDataTemplate}"
+    behaviors:NavigationViewHeaderBehavior.HeaderContext="{x:Bind ViewModel}">
+
+    <Grid MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">
+        <ScrollView Grid.Row="1" VerticalAlignment="Top">
+            <views:DevDriveInsightsView />
+        </ScrollView>
+    </Grid>
+</Page>