Xaml diagnostics

UnigramDev · Jan 18, 2024 · d13625f · d13625f
1 parent 834cfcc
commit d13625f
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 0 deletions.
diff --git a/Telegram/Common/WatchDog.cs b/Telegram/Common/WatchDog.cs
@@ -3,7 +3,9 @@
 using Microsoft.AppCenter.Crashes;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Telegram.Common;
 using Telegram.Controls;
@@ -18,6 +20,7 @@
 using Windows.System;
 using Windows.System.Profile;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Automation.Peers;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
 using File = System.IO.File;
@@ -68,6 +71,9 @@ public class WatchDog
         private static string _lastSessionErrorReportId;
         private static bool _lastSessionTerminatedUnexpectedly;
 
+        [DllImport("Telegram.Diagnostics.dll")]
+        private static extern int start(uint pid, uint framework);
+
         static WatchDog()
         {
             _crashLog = Path.Combine(ApplicationData.Current.LocalFolder.Path, "crash.log");
@@ -107,6 +113,18 @@ public static void Initialize()
                 args.Handled = args.Exception is not LayoutCycleException;
             };
 
+            if (Constants.DEBUG && !Debugger.IsAttached)
+            {
+                var process = Process.GetCurrentProcess();
+                var hr = start((uint)process.Id, 1);
+
+                var ex = Marshal.GetExceptionForHR(hr);
+                if (ex != null)
+                {
+                    Crashes.TrackError(ex);
+                }
+            }
+
             if (_disabled)
             {
                 return;
@@ -144,6 +162,13 @@ public static void Initialize()
                 if (path.Length > 0 && File.Exists(path))
                 {
                     var data = File.ReadAllText(path);
+
+                    var layout = GetLayoutCyclePath();
+                    if (layout.Length > 0 && File.Exists(layout))
+                    {
+                        data += "\n\n" + File.ReadAllText(layout);
+                    }
+
                     return new[] { ErrorAttachmentLog.AttachmentWithText(data, "crash.txt") };
                 }
 
@@ -157,6 +182,18 @@ public static void Initialize()
                     { "DeviceFamily", AnalyticsInfo.VersionInfo.DeviceFamily },
                     { "Architecture", Package.Current.Id.Architecture.ToString() }
                 });
+
+            if (SettingsService.Current.Diagnostics.XamlDiagnostics)
+            {
+                var process = Process.GetCurrentProcess();
+                var hr = start((uint)process.Id, 1);
+
+                var ex = Marshal.GetExceptionForHR(hr);
+                if (ex != null)
+                {
+                    Crashes.TrackError(ex);
+                }
+            }
         }
 
         public static void TrackEvent(string name)
@@ -286,6 +323,11 @@ private static string GetErrorReportPath(string reportId)
             return Path.Combine(ApplicationData.Current.LocalFolder.Path, _reports, reportId + ".appcenter");
         }
 
+        private static string GetLayoutCyclePath()
+        {
+            return Path.Combine(ApplicationData.Current.LocalFolder.Path, "LayoutCycle.txt");
+        }
+
         public static void Suspend()
         {
             if (File.Exists(_crashLog))

diff --git a/Telegram/Services/Settings/DiagnosticsSettings.cs b/Telegram/Services/Settings/DiagnosticsSettings.cs
@@ -80,6 +80,13 @@ public bool EnableWebViewDevTools
             set => AddOrUpdateValue(ref _enableWebViewDevTools, "EnableWebViewDevTools", value);
         }
 
+        private bool? _bridgeDebug;
+        public bool BridgeDebug
+        {
+            get => _bridgeDebug ??= GetValueOrDefault("BridgeDebug", false);
+            set => AddOrUpdateValue(ref _bridgeDebug, "BridgeDebug", value);
+        }
+
         private long? _storageMaxTimeFromLastAccess;
         public long StorageMaxTimeFromLastAccess
         {
@@ -94,6 +101,13 @@ public bool UseStorageOptimizer
             set => AddOrUpdateValue(ref _useStorageOptimizer, "UseStorageOptimizer", value);
         }
 
+        private bool? _xamlDiagnostics;
+        public bool XamlDiagnostics
+        {
+            get => _xamlDiagnostics ??= GetValueOrDefault("XamlDiagnostics", true);
+            set => AddOrUpdateValue(ref _xamlDiagnostics, "XamlDiagnostics", value);
+        }
+
         private bool? _lastCrashWasLayoutCycle;
         public bool LastCrashWasLayoutCycle
         {

diff --git a/Telegram/Telegram.Diagnostics.dll b/Telegram/Telegram.Diagnostics.dll
diff --git a/Telegram/Telegram.csproj b/Telegram/Telegram.csproj
@@ -1533,6 +1533,7 @@
     <Compile Include="Controls\ProgressVoice.cs" />
     <Compile Include="Converters\LastSeenConverter.cs" />
     <Compile Include="ViewModels\InstantViewModel.cs" />
+    <Content Include="Telegram.Diagnostics.dll" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">

diff --git a/Telegram/Views/DiagnosticsPage.xaml b/Telegram/Views/DiagnosticsPage.xaml
@@ -21,6 +21,10 @@
                               Content="Use Test DC"
                               Style="{StaticResource SettingsCheckBoxStyle}" />
 
+                    <CheckBox IsChecked="{x:Bind services:SettingsService.Current.Diagnostics.XamlDiagnostics, Mode=TwoWay}"
+                              Content="Xaml Diagnostics"
+                              Style="{StaticResource SettingsCheckBoxStyle}" />
+
                     <CheckBox IsChecked="{x:Bind services:SettingsService.Current.Diagnostics.AllowRightToLeft, Mode=TwoWay}"
                               Content="Allow Right to Left"
                               Style="{StaticResource SettingsCheckBoxStyle}" />