Some changes

ReneLergner · Oct 12, 2024 · d9da499 · d9da499
1 parent 7c18a16
commit d9da499
Show file tree

Hide file tree

Showing 24 changed files with 193 additions and 35 deletions.
diff --git a/WPinternals/CommandLine.cs b/WPinternals/CommandLine.cs
@@ -156,8 +156,12 @@ internal static async Task ParseCommandLine(System.Threading.SynchronizationCont
                                 ? Convert.ToUInt64(args[2][2..], 16)
                                 : Convert.ToUInt64(args[2], 10);
                         }
-                        catch
+                        catch (Exception ex)
                         {
+                            LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                            LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                            LogFile.Log(ex.Message, LogType.FileAndConsole);
+                            LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
                             LogFile.Log("Bad start sector", LogType.ConsoleOnly);
                             break;
                         }
@@ -1674,8 +1678,12 @@ internal static void OpenConsole()
                     };
                     Console.SetOut(standardOutput);
                 }
-                catch
+                catch (Exception ex)
                 {
+                    LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                    LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                    LogFile.Log(ex.Message, LogType.FileAndConsole);
+                    LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
                 }
             }
 

diff --git a/WPinternals/HelperClasses/SeekableStream.cs b/WPinternals/HelperClasses/SeekableStream.cs
@@ -48,8 +48,13 @@ internal SeekableStream(Func<Stream> StreamInitializer, long? Length = null)
                 {
                     UnderlyingStreamLength = UnderlyingStream.Length;
                 }
-                catch
+                catch (Exception ex)
                 {
+                    LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                    LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                    LogFile.Log(ex.Message, LogType.FileAndConsole);
+                    LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                     throw new ArgumentException("Unknown stream length");
                 }
             }

diff --git a/WPinternals/Models/Lumia/MSR/LumiaDownloadModel.cs b/WPinternals/Models/Lumia/MSR/LumiaDownloadModel.cs
@@ -18,6 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Xml;
@@ -53,8 +54,13 @@ internal static string[] SearchEmergencyFiles(string ProductType)
             {
                 Config = Client.DownloadString($"https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/{ProductType}/emergency_flash_config.xml");
             }
-            catch
+            catch (Exception ex)
             {
+                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                LogFile.Log(ex.Message, LogType.FileAndConsole);
+                LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                 LogFile.Log("Emergency files for " + ProductType + " not found", LogType.FileAndConsole);
                 return null;
             }

diff --git a/WPinternals/Models/Lumia/NCSd/NokiaCareSuiteModel.cs b/WPinternals/Models/Lumia/NCSd/NokiaCareSuiteModel.cs
@@ -22,6 +22,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
+using WPinternals.HelperClasses;
 
 namespace WPinternals.Models.Lumia.NCSd
 {
@@ -73,20 +74,26 @@ public NokiaCareSuiteModel(string DevicePath) : base(DevicePath)
                 Length = Device.InputPipe.Read(Buffer);
             }
 
-            JsonDocument ResultMessage = JsonDocument.Parse(System.Text.Encoding.ASCII.GetString(Buffer, 0, Length));
+            string ResultString = System.Text.Encoding.ASCII.GetString(Buffer, 0, Length);
+            JsonDocument ResultMessage = JsonDocument.Parse(ResultString);
 
             try
             {
-                JsonElement? ResultToken = ResultMessage.RootElement.GetProperty("result");
-                if (ResultToken == null || ResultElement == null)
+                bool result = ResultMessage.RootElement.TryGetProperty("result", out JsonElement ResultToken);
+                if (!result || ResultElement == null)
                 {
                     return null;
                 }
 
-                return ResultToken.Value.GetProperty(ResultElement);
+                return ResultToken.GetProperty(ResultElement);
             }
-            catch
+            catch (Exception ex)
             {
+                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                LogFile.Log(ex.Message, LogType.FileAndConsole);
+                LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                 return null;
             }
         }

diff --git a/WPinternals/Models/Lumia/UEFI/BootMgr/LumiaBootManagerAppModel.cs b/WPinternals/Models/Lumia/UEFI/BootMgr/LumiaBootManagerAppModel.cs
@@ -348,8 +348,13 @@ internal void ResetPhone()
                 ByteOperations.WriteAsciiString(Request, 0, RebootSignature);
                 ExecuteRawVoidMethod(Request);
             }
-            catch
+            catch (Exception ex)
             {
+                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                LogFile.Log(ex.Message, LogType.FileAndConsole);
+                LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                 LogFile.Log("Sending reset-request failed", LogType.FileOnly);
                 LogFile.Log("Assuming automatic reset already in progress", LogType.FileOnly);
             }

diff --git a/WPinternals/Models/Lumia/UEFI/Flash/LumiaFlashAppModel.cs b/WPinternals/Models/Lumia/UEFI/Flash/LumiaFlashAppModel.cs
@@ -911,8 +911,13 @@ internal void ResetPhone()
                 ByteOperations.WriteAsciiString(Request, 0, RebootSignature);
                 ExecuteRawVoidMethod(Request);
             }
-            catch
+            catch (Exception ex)
             {
+                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                LogFile.Log(ex.Message, LogType.FileAndConsole);
+                LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                 LogFile.Log("Sending reset-request failed", LogType.FileOnly);
                 LogFile.Log("Assuming automatic reset already in progress", LogType.FileOnly);
             }

diff --git a/WPinternals/Models/Privileges.cs b/WPinternals/Models/Privileges.cs
@@ -22,6 +22,7 @@
 using System.Collections.Specialized;
 using System.Runtime.InteropServices;
 using System.Threading;
+using WPinternals.HelperClasses;
 
 namespace WPinternals
 {
@@ -488,8 +489,13 @@ public static void RunWithPrivilege(string privilege, bool enabled, PrivilegedCa
 
                 callback(state);
             }
-            catch
+            catch (Exception ex)
             {
+                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                LogFile.Log(ex.Message, LogType.FileAndConsole);
+                LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                 p.Revert();
                 throw;
             }

diff --git a/WPinternals/Models/QualcommDownload.cs b/WPinternals/Models/QualcommDownload.cs
@@ -21,6 +21,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using WPinternals.HelperClasses;
 
 namespace WPinternals
 {
@@ -40,8 +41,13 @@ public bool IsAlive()
                 Serial.SendCommand([0x06], [0x02]);
                 return true;
             }
-            catch
+            catch (Exception ex)
             {
+                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                LogFile.Log(ex.Message, LogType.FileAndConsole);
+                LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                 return false;
             }
         }

diff --git a/WPinternals/Models/QualcommFirehose.cs b/WPinternals/Models/QualcommFirehose.cs
@@ -67,8 +67,13 @@ public bool ConnectToProgrammer(byte[] PacketFromPcToProgrammer)
                     Serial.SendData(PacketFromPcToProgrammer);
                     LogFile.Log("Hello packet accepted", LogType.FileOnly);
                 }
-                catch
+                catch (Exception ex)
                 {
+                    LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                    LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                    LogFile.Log(ex.Message, LogType.FileAndConsole);
+                    LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                     LogFile.Log("Hello packet not accepted", LogType.FileOnly);
                 }
 

diff --git a/WPinternals/Models/QualcommSahara.cs b/WPinternals/Models/QualcommSahara.cs
@@ -285,8 +285,13 @@ public bool Handshake()
 
                 byte[] Ready = Serial.SendCommand(HelloResponse, [0x03, 0x00, 0x00, 0x00]);
             }
-            catch
+            catch (Exception ex)
             {
+                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                LogFile.Log(ex.Message, LogType.FileAndConsole);
+                LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                 Result = false;
             }
 

diff --git a/WPinternals/TestCode.cs b/WPinternals/TestCode.cs
@@ -195,8 +195,13 @@ internal static async Task RewriteParts(string PartPath)
                     MassStorage.RestorePartition(part, partname, (v, t) => LogFile.Log("Progress: " + v + "%", LogType.ConsoleOnly));
                     LogFile.Log("", LogType.ConsoleOnly);
                 }
-                catch
+                catch (Exception ex)
                 {
+                    LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                    LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                    LogFile.Log(ex.Message, LogType.FileAndConsole);
+                    LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                     LogFile.Log("", LogType.ConsoleOnly);
                     LogFile.Log($"Failed writing {partname} to the device.", LogType.ConsoleOnly);
                 }

diff --git a/WPinternals/ViewModels/ContextViewModel.cs b/WPinternals/ViewModels/ContextViewModel.cs
@@ -29,7 +29,12 @@ internal class ContextViewModel : INotifyPropertyChanged
     {
         protected SynchronizationContext UIContext;
 
-        public bool IsSwitchingInterface = false;
+        private bool _IsSwitchingInterface = false;
+        public bool IsSwitchingInterface
+        {
+            get => _IsSwitchingInterface;
+            set => _IsSwitchingInterface = value;
+        }
         public bool IsFlashModeOperation = false;
 
         public event PropertyChangedEventHandler PropertyChanged = delegate { };

diff --git a/WPinternals/ViewModels/DownloadsViewModel.cs b/WPinternals/ViewModels/DownloadsViewModel.cs
@@ -82,8 +82,13 @@ internal DownloadsViewModel(PhoneNotifierViewModel Notifier)
                     {
                         LastFFUStatusText = $"Error: {Ex.Message}. File \"{FFUFile}\" was not added.";
                     }
-                    catch
+                    catch (Exception ex)
                     {
+                        LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                        LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                        LogFile.Log(ex.Message, LogType.FileAndConsole);
+                        LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                         LastFFUStatusText = $"Error: File \"{FFUFile}\" was not added.";
                     }
                 }
@@ -120,8 +125,13 @@ internal DownloadsViewModel(PhoneNotifierViewModel Notifier)
                     {
                         LastSecWIMStatusText = $"Error: {Ex.Message}. File \"{SecWIMFile}\" was not added.";
                     }
-                    catch
+                    catch (Exception ex)
                     {
+                        LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                        LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                        LogFile.Log(ex.Message, LogType.FileAndConsole);
+                        LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                         LastSecWIMStatusText = $"Error: File \"{SecWIMFile}\" was not added.";
                     }
                 }
@@ -1093,8 +1103,13 @@ public static async Task DownloadFileAsync(this HttpClient client, Uri address,
 
                 completed?.Invoke(true);
             }
-            catch
+            catch (Exception ex)
             {
+                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                LogFile.Log(ex.Message, LogType.FileAndConsole);
+                LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                 completed?.Invoke(false);
             }
         }

diff --git a/WPinternals/ViewModels/LumiaUnlockBootViewModel.cs b/WPinternals/ViewModels/LumiaUnlockBootViewModel.cs
@@ -850,8 +850,13 @@ private void SetSupportedFFUPath()
                     FFU FFU = new(_FFUPath);
                     IsSupportedFfuNeeded = !App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == FFU.GetOSVersion());
                 }
-                catch
+                catch (Exception ex)
                 {
+                    LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                    LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                    LogFile.Log(ex.Message, LogType.FileAndConsole);
+                    LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                     IsSupportedFfuNeeded = false;
                     return;
                 }
@@ -918,8 +923,13 @@ private void SetSupportedFFUPath()
                     FFU ProfileFFU = new(_ProfileFFUPath);
                     IsSupportedFfuNeeded = !App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == ProfileFFU.GetOSVersion());
                 }
-                catch
+                catch (Exception ex)
                 {
+                    LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                    LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                    LogFile.Log(ex.Message, LogType.FileAndConsole);
+                    LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                     IsSupportedFfuNeeded = false;
                     return;
                 }
@@ -1023,8 +1033,13 @@ private void ValidateSupportedFfuPath()
                     ValidatedSupportedFfuPath = SupportedFFUPath;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                LogFile.Log(ex.Message, LogType.FileAndConsole);
+                LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                 IsSupportedFfuValid = false;
             }
         }

diff --git a/WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs b/WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs
@@ -1742,8 +1742,13 @@ internal static async Task LumiaRelockUEFI(PhoneNotifierViewModel Notifier, stri
                             await Notifier.WaitForArrival();
                         }
                     }
-                    catch
+                    catch (Exception ex)
                     {
+                        LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                        LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                        LogFile.Log(ex.Message, LogType.FileAndConsole);
+                        LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                         // If switching to mass storage mode failed, then we just skip that part. This might be a half unlocked phone.
                         LogFile.Log("Skipping Mass Storage mode", LogType.FileAndConsole);
                     }

diff --git a/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs b/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs
@@ -787,6 +787,8 @@ internal async static Task LumiaV2CustomFlashInternal(PhoneNotifierViewModel Not
                         {
                             LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
                             LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                            LogFile.Log(ex.Message, LogType.FileAndConsole);
+                            LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
                             FailedToStartProgrammer = true;
                         }
                     }
@@ -810,6 +812,8 @@ internal async static Task LumiaV2CustomFlashInternal(PhoneNotifierViewModel Not
                             {
                                 LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
                                 LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                                LogFile.Log(ex.Message, LogType.FileAndConsole);
+                                LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
                                 FailedToStartProgrammer = true;
                             }
                         }
@@ -1507,6 +1511,8 @@ .. GetNonOptimizedPayloads(FlashParts, FFU.ChunkSize, (uint)(FlashInfo.WriteBuff
                                     {
                                         LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
                                         LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                                        LogFile.Log(ex.Message, LogType.FileAndConsole);
+                                        LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
                                         FailedToStartProgrammer = true;
                                     }
                                 }
@@ -1787,6 +1793,8 @@ .. GetNonOptimizedPayloads(FlashParts, FFU.ChunkSize, (uint)(FlashInfo.WriteBuff
                             {
                                 LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
                                 LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                                LogFile.Log(ex.Message, LogType.FileAndConsole);
+                                LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
                                 FailedToStartProgrammer = true;
                             }
                         }

diff --git a/WPinternals/ViewModels/NokiaFlashViewModel.cs b/WPinternals/ViewModels/NokiaFlashViewModel.cs
@@ -286,8 +286,13 @@ private void StartLoadDeviceInfo()
                             LogFile.Log("Native Debug Status: " + NativeDebugStatus.ToString());
                         }
                     }
-                    catch
+                    catch (Exception ex)
                     {
+                        LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                        LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                        LogFile.Log(ex.Message, LogType.FileAndConsole);
+                        LogFile.Log(ex.StackTrace, LogType.FileAndConsole);
+
                         LogFile.Log("Reading status from Flash interface was aborted.");
                     }
                     DeviceInfoLoaded = true;