From bcec0a72e6fde499a4b8a97d53c914176574b7b7 Mon Sep 17 00:00:00 2001 From: Gustave Monce Date: Sat, 12 Oct 2024 13:45:51 +0200 Subject: [PATCH] Nokia Flash Model -> Nokia UEFI Model --- .../UEFIApps/LumiaBootManagerAppModel.cs | 2 +- .../Models/UEFIApps/LumiaFlashAppModel.cs | 2 +- .../Models/UEFIApps/LumiaPhoneInfoAppModel.cs | 2 +- .../{NokiaFlashModel.cs => NokiaUEFIModel.cs} | 4 +-- .../ViewModels/LumiaV2UnlockBootViewModel.cs | 2 +- .../ViewModels/PhoneNotifierViewModel.cs | 26 +++++++++---------- WPinternals/ViewModels/SwitchModeViewModel.cs | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) rename WPinternals/Models/UEFIApps/{NokiaFlashModel.cs => NokiaUEFIModel.cs} (98%) diff --git a/WPinternals/Models/UEFIApps/LumiaBootManagerAppModel.cs b/WPinternals/Models/UEFIApps/LumiaBootManagerAppModel.cs index f817968..0e1db5c 100644 --- a/WPinternals/Models/UEFIApps/LumiaBootManagerAppModel.cs +++ b/WPinternals/Models/UEFIApps/LumiaBootManagerAppModel.cs @@ -24,7 +24,7 @@ using System.Linq; namespace WPinternals { - internal class LumiaBootManagerAppModel : NokiaFlashModel + internal class LumiaBootManagerAppModel : NokiaUEFIModel { internal readonly LumiaBootManagerPhoneInfo BootManagerInfo = new(); diff --git a/WPinternals/Models/UEFIApps/LumiaFlashAppModel.cs b/WPinternals/Models/UEFIApps/LumiaFlashAppModel.cs index 2c087e7..7db7d3c 100644 --- a/WPinternals/Models/UEFIApps/LumiaFlashAppModel.cs +++ b/WPinternals/Models/UEFIApps/LumiaFlashAppModel.cs @@ -68,7 +68,7 @@ namespace WPinternals SkipSignatureCheck = 8 } - internal class LumiaFlashAppModel : NokiaFlashModel + internal class LumiaFlashAppModel : NokiaUEFIModel { internal readonly LumiaFlashAppPhoneInfo FlashAppInfo = new(); private UefiSecurityStatusResponse _SecurityStatus = null; diff --git a/WPinternals/Models/UEFIApps/LumiaPhoneInfoAppModel.cs b/WPinternals/Models/UEFIApps/LumiaPhoneInfoAppModel.cs index d8356b3..3b66f74 100644 --- a/WPinternals/Models/UEFIApps/LumiaPhoneInfoAppModel.cs +++ b/WPinternals/Models/UEFIApps/LumiaPhoneInfoAppModel.cs @@ -25,7 +25,7 @@ using System.Linq; namespace WPinternals { - internal class LumiaPhoneInfoAppModel : NokiaFlashModel + internal class LumiaPhoneInfoAppModel : NokiaUEFIModel { internal readonly LumiaPhoneInfoAppPhoneInfo PhoneInfoAppInfo = new(); diff --git a/WPinternals/Models/UEFIApps/NokiaFlashModel.cs b/WPinternals/Models/UEFIApps/NokiaUEFIModel.cs similarity index 98% rename from WPinternals/Models/UEFIApps/NokiaFlashModel.cs rename to WPinternals/Models/UEFIApps/NokiaUEFIModel.cs index 4906cc8..44bb5f7 100644 --- a/WPinternals/Models/UEFIApps/NokiaFlashModel.cs +++ b/WPinternals/Models/UEFIApps/NokiaUEFIModel.cs @@ -24,7 +24,7 @@ namespace WPinternals { internal delegate void InterfaceChangedHandler(PhoneInterfaces NewInterface, string DevicePath); - internal class NokiaFlashModel : NokiaPhoneModel + internal class NokiaUEFIModel : NokiaPhoneModel { private string _devicePath; @@ -50,7 +50,7 @@ namespace WPinternals /* NOKXCE */ private const string EchoSignature = $"{CommonExtendedMessageSignature}E"; - public NokiaFlashModel(string DevicePath) : base(DevicePath) + public NokiaUEFIModel(string DevicePath) : base(DevicePath) { _devicePath = DevicePath; } diff --git a/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs b/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs index 3af7249..313b528 100644 --- a/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs +++ b/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs @@ -2344,7 +2344,7 @@ namespace WPinternals LogFile.BeginAction("FixBoot"); LogFile.Log("Command: Fix boot after unlocking bootloader", LogType.FileAndConsole); - NokiaFlashModel FlashModel = (NokiaFlashModel)Notifier.CurrentModel; + NokiaUEFIModel FlashModel = (NokiaUEFIModel)Notifier.CurrentModel; if (SetWorkingStatus == null) { diff --git a/WPinternals/ViewModels/PhoneNotifierViewModel.cs b/WPinternals/ViewModels/PhoneNotifierViewModel.cs index cf3b70f..7f7f06e 100644 --- a/WPinternals/ViewModels/PhoneNotifierViewModel.cs +++ b/WPinternals/ViewModels/PhoneNotifierViewModel.cs @@ -240,7 +240,7 @@ namespace WPinternals FlashAppType type = FlashAppType.FlashApp; try { - NokiaFlashModel tmpModel = new NokiaFlashModel(e.DevicePath); + NokiaUEFIModel tmpModel = new NokiaUEFIModel(e.DevicePath); type = tmpModel.GetFlashAppType(); tmpModel.Dispose(); LogFile.Log("Flash App Type: " + type.ToString(), LogType.FileOnly); @@ -255,7 +255,7 @@ namespace WPinternals case FlashAppType.BootManager: { CurrentModel = new LumiaBootManagerAppModel(e.DevicePath); - ((NokiaFlashModel)CurrentModel).InterfaceChanged += InterfaceChanged; + ((NokiaUEFIModel)CurrentModel).InterfaceChanged += InterfaceChanged; CurrentInterface = PhoneInterfaces.Lumia_Bootloader; LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly); @@ -268,9 +268,9 @@ namespace WPinternals case FlashAppType.FlashApp: { CurrentModel = new LumiaFlashAppModel(e.DevicePath); - ((NokiaFlashModel)CurrentModel).InterfaceChanged += InterfaceChanged; + ((NokiaUEFIModel)CurrentModel).InterfaceChanged += InterfaceChanged; - ((NokiaFlashModel)CurrentModel).DisableRebootTimeOut(); + ((NokiaUEFIModel)CurrentModel).DisableRebootTimeOut(); CurrentInterface = PhoneInterfaces.Lumia_Flash; LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly); LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly); @@ -282,9 +282,9 @@ namespace WPinternals case FlashAppType.PhoneInfoApp: { CurrentModel = new LumiaPhoneInfoAppModel(e.DevicePath); - ((NokiaFlashModel)CurrentModel).InterfaceChanged += InterfaceChanged; + ((NokiaUEFIModel)CurrentModel).InterfaceChanged += InterfaceChanged; - ((NokiaFlashModel)CurrentModel).DisableRebootTimeOut(); + ((NokiaUEFIModel)CurrentModel).DisableRebootTimeOut(); CurrentInterface = PhoneInterfaces.Lumia_PhoneInfo; LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly); LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly); @@ -442,7 +442,7 @@ namespace WPinternals case PhoneInterfaces.Lumia_Bootloader: { CurrentModel = new LumiaBootManagerAppModel(DevicePath); - ((NokiaFlashModel)CurrentModel).InterfaceChanged += InterfaceChanged; + ((NokiaUEFIModel)CurrentModel).InterfaceChanged += InterfaceChanged; CurrentInterface = PhoneInterfaces.Lumia_Bootloader; LogFile.Log("Found device on interface: " + LumiaFlashInterfaceGuid.ToString(), LogType.FileOnly); @@ -455,9 +455,9 @@ namespace WPinternals case PhoneInterfaces.Lumia_Flash: { CurrentModel = new LumiaFlashAppModel(DevicePath); - ((NokiaFlashModel)CurrentModel).InterfaceChanged += InterfaceChanged; + ((NokiaUEFIModel)CurrentModel).InterfaceChanged += InterfaceChanged; - ((NokiaFlashModel)CurrentModel).DisableRebootTimeOut(); + ((NokiaUEFIModel)CurrentModel).DisableRebootTimeOut(); CurrentInterface = PhoneInterfaces.Lumia_Flash; LogFile.Log("Found device on interface: " + LumiaFlashInterfaceGuid.ToString(), LogType.FileOnly); LogFile.Log("Device path: " + DevicePath, LogType.FileOnly); @@ -469,9 +469,9 @@ namespace WPinternals case PhoneInterfaces.Lumia_PhoneInfo: { CurrentModel = new LumiaPhoneInfoAppModel(DevicePath); - ((NokiaFlashModel)CurrentModel).InterfaceChanged += InterfaceChanged; + ((NokiaUEFIModel)CurrentModel).InterfaceChanged += InterfaceChanged; - ((NokiaFlashModel)CurrentModel).DisableRebootTimeOut(); + ((NokiaUEFIModel)CurrentModel).DisableRebootTimeOut(); CurrentInterface = PhoneInterfaces.Lumia_PhoneInfo; LogFile.Log("Found device on interface: " + LumiaFlashInterfaceGuid.ToString(), LogType.FileOnly); LogFile.Log("Device path: " + DevicePath, LogType.FileOnly); @@ -485,9 +485,9 @@ namespace WPinternals LogFile.Log("Flash App Type could not be determined, assuming FlashApp", LogType.FileOnly); CurrentModel = new LumiaFlashAppModel(DevicePath); - ((NokiaFlashModel)CurrentModel).InterfaceChanged += InterfaceChanged; + ((NokiaUEFIModel)CurrentModel).InterfaceChanged += InterfaceChanged; - ((NokiaFlashModel)CurrentModel).DisableRebootTimeOut(); + ((NokiaUEFIModel)CurrentModel).DisableRebootTimeOut(); CurrentInterface = PhoneInterfaces.Lumia_Flash; LogFile.Log("Found device on interface: " + LumiaFlashInterfaceGuid.ToString(), LogType.FileOnly); LogFile.Log("Device path: " + DevicePath, LogType.FileOnly); diff --git a/WPinternals/ViewModels/SwitchModeViewModel.cs b/WPinternals/ViewModels/SwitchModeViewModel.cs index 4740d4f..08835c4 100644 --- a/WPinternals/ViewModels/SwitchModeViewModel.cs +++ b/WPinternals/ViewModels/SwitchModeViewModel.cs @@ -649,7 +649,7 @@ namespace WPinternals { if (TargetMode == PhoneInterfaces.Lumia_Bootloader) { - ((NokiaFlashModel)PhoneNotifier.CurrentModel).DisableRebootTimeOut(); + ((NokiaUEFIModel)PhoneNotifier.CurrentModel).DisableRebootTimeOut(); } ModeSwitchSuccessWrapper();