Fix nullability

Author: neon-nyan

CollapseLauncher/Classes/GamePresetProperty.cs

@@ -53,7 +53,7 @@ internal static GamePresetProperty Create(UIElement uiElementParent, ILauncherAp
                     property.GameSettings = new HonkaiSettings(property.GameVersion);
                     property.GameCache    = new HonkaiCache(uiElementParent, property.GameVersion, property.GameSettings);
                     property.GameRepair   = new HonkaiRepairV2(uiElementParent, property.GameVersion, property.GameSettings);
-                    property.GameInstall  = new HonkaiInstall(uiElementParent, property.GameVersion, property.GameSettings);
+                    property.GameInstall  = new HonkaiInstall(uiElementParent, property.GameVersion, property.GameSettings, property.GameRepair);
                     break;
                 case GameNameType.StarRail:
                     property.GameVersion  = new GameTypeStarRailVersion(launcherApis, gamePreset);

CollapseLauncher/Classes/InstallManagement/Honkai/HonkaiInstall.cs

@@ -27,27 +27,30 @@
 // ReSharper disable IdentifierTypo
 // ReSharper disable SwitchStatementMissingSomeEnumCasesNoDefault
 // ReSharper disable SwitchStatementHandlesSomeKnownEnumValuesWithDefault
+#pragma warning disable IDE0130
 
+#nullable enable
 namespace CollapseLauncher.InstallManager.Honkai
 {
     internal sealed partial class HonkaiInstall : InstallManagerBase
     {
         #region Override Properties
 
-        protected override bool               _canDeltaPatch          => GameVersionManager.IsGameHasDeltaPatch();
-        protected override DeltaPatchProperty _gameDeltaPatchProperty => GameVersionManager.GetDeltaPatchInfo();
+        protected override bool                _canDeltaPatch          => GameVersionManager.IsGameHasDeltaPatch();
+        protected override DeltaPatchProperty? _gameDeltaPatchProperty => GameVersionManager.GetDeltaPatchInfo();
 
         #endregion
 
         #region Properties
 
-        private HonkaiRepairV2 _gameRepairManager { get; set; }
+        private HonkaiRepairV2 _gameRepairManager { get; }
 
         #endregion
 
-        public HonkaiInstall(UIElement parentUI, IGameVersion gameVersionManager, IGameSettings gameSettings)
+        public HonkaiInstall(UIElement parentUI, IGameVersion gameVersionManager, IGameSettings gameSettings, IRepair gameRepairManager)
             : base(parentUI, gameVersionManager, gameSettings)
         {
+            _gameRepairManager = (HonkaiRepairV2)gameRepairManager;
         }
 
         #region Public Methods
@@ -64,7 +67,7 @@ public override async ValueTask<int> StartPackageVerification(List<GameInstallPa
 
             // If the confirm is 1 (verified) or -1 (cancelled), then return the code
             int deltaPatchConfirm = await ConfirmDeltaPatchDialog(_gameDeltaPatchProperty,
-                                                                  _gameRepairManager ??= GetGameRepairInstance(_gameDeltaPatchProperty.SourceVer));
+                                                                  _gameRepairManager);
             if (deltaPatchConfirm is -1 or 1)
             {
                 return deltaPatchConfirm;
@@ -74,16 +77,14 @@ public override async ValueTask<int> StartPackageVerification(List<GameInstallPa
             return await base.StartPackageVerification(gamePackage);
         }
 
-#nullable enable
         protected override HonkaiRepairV2 GetGameRepairInstance(string? versionString) =>
-            new HonkaiRepairV2(ParentUI,
-                               GameVersionManager,
-                               GameSettings!,
-                               versionString,
-                               true);
-#nullable restore
-
-        protected override async Task StartPackageInstallationInner(List<GameInstallPackage> gamePackage = null,
+            new(ParentUI,
+                GameVersionManager,
+                GameSettings!,
+                versionString,
+                true);
+
+        protected override async Task StartPackageInstallationInner(List<GameInstallPackage>? gamePackage = null,
                                                                     bool isOnlyInstallPackage = false,
                                                                     bool doNotDeleteZipExplicit = false)
         {
@@ -100,8 +101,8 @@ protected override async Task StartPackageInstallationInner(List<GameInstallPack
         public override async ValueTask<bool> TryShowFailedGameConversionState()
         {
             // Get the target and source path
-            string gamePath            = GameVersionManager.GameDirPath;
-            string gamePathIngredients = GetFailedGameConversionFolder(gamePath);
+            string  gamePath            = GameVersionManager.GameDirPath;
+            string? gamePathIngredients = GetFailedGameConversionFolder(gamePath);
             // If path doesn't exist or null, then return false
             if (gamePathIngredients is null || !Directory.Exists(gamePathIngredients))
             {
@@ -136,24 +137,24 @@ public override async ValueTask<bool> TryShowFailedGameConversionState()
 
         #region Private Methods - Utilities
 
-        private string GetFailedGameConversionFolder(string basepath)
+        private string? GetFailedGameConversionFolder(string basepath)
         {
             try
             {
                 // Step back once from the game directory
-                string ParentPath = Path.GetDirectoryName(basepath);
+                string? parentPath = Path.GetDirectoryName(basepath);
                 // Get the ingredient path
-                if (ParentPath != null)
+                if (!string.IsNullOrEmpty(parentPath))
                 {
-                    string IngredientPath = Directory
-                                           .EnumerateDirectories(ParentPath,
+                    string? ingredientPath = Directory
+                                           .EnumerateDirectories(parentPath,
                                                                  $"{GameVersionManager.GamePreset.GameDirectoryName}*_ConvertedTo-*_Ingredients",
                                                                  SearchOption.TopDirectoryOnly)
                                            .FirstOrDefault();
                     // If the path is not null, then return
-                    if (IngredientPath is not null)
+                    if (ingredientPath is not null)
                     {
-                        return IngredientPath;
+                        return ingredientPath;
                     }
                 }
             }

CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml.cs

@@ -69,6 +69,7 @@
 // - HomePage.Misc.cs
 //   Contains miscellaneous method that doesn't fit into other categories and is not big enough to be in its own file
 
+#nullable enable
 namespace CollapseLauncher.Pages
 {
     [GeneratedBindableCustomProperty]
@@ -167,7 +168,7 @@ private void InitializeConsoleValues()
 
         private void ReturnToHomePage()
         {
-            if (!(m_mainPage?.TryGetCurrentPageObject(out object typeOfPage) ?? false) ||
+            if (!(m_mainPage?.TryGetCurrentPageObject(out object? typeOfPage) ?? false) ||
                 typeOfPage is not Type asTypePage ||
                 asTypePage != typeof(HomePage) ||
                 GamePropertyVault.GetCurrentGameProperty() != CurrentGameProperty)
@@ -305,19 +306,13 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
                         break;
                     case GameInstallStateEnum.InstalledHavePlugin:
                     case GameInstallStateEnum.NeedsUpdate:
-                        if (CurrentGameProperty.GameInstall != null)
-                        {
-                            CurrentGameProperty.GameInstall.PostInstallBehaviour = PostInstallBehaviour.StartGame;
-                        }
+                        CurrentGameProperty.GameInstall?.PostInstallBehaviour = PostInstallBehaviour.StartGame;
 
                         UpdateGameDialog(null, null);
                         break;
                     case GameInstallStateEnum.NotInstalled:
                     case GameInstallStateEnum.GameBroken:
-                        if (CurrentGameProperty.GameInstall != null)
-                        {
-                            CurrentGameProperty.GameInstall.PostInstallBehaviour = PostInstallBehaviour.StartGame;
-                        }
+                        CurrentGameProperty.GameInstall?.PostInstallBehaviour = PostInstallBehaviour.StartGame;
 
                         InstallGameDialog(null, null);
                         break;
@@ -951,7 +946,7 @@ private async void CleanupFilesButton_Click(object sender, RoutedEventArgs e)
                                                 Locale.Current.Lang?._FileCleanupPage?.LoadingSubtitle2);
 
                 GameStartupSetting.Flyout.Hide();
-                if (CurrentGameProperty?.GameInstall != null)
+                if (CurrentGameProperty.GameInstall != null)
                     await CurrentGameProperty.GameInstall.CleanUpGameFiles();
             }
             catch (Exception ex)