PM-3350 Updated AppCenter package to latest version 5.0.3 and updated some things into MAUI style

src/App/App.csproj

@@ -87,7 +87,7 @@
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		  <PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<!-- <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.2" /> -->
+		<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="zxcvbn-core" Version="7.0.92" />
 		<PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />

src/Core/Core.csproj

@@ -53,7 +53,7 @@
 	  <PackageReference Include="MessagePack" Version="2.5.124" />
 	  <PackageReference Include="CsvHelper" Version="30.0.1" />
 	  <PackageReference Include="LiteDB" Version="5.0.17" />
-	  <!-- <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.2" /> -->
+	  <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
 	  <PackageReference Include="PCLCrypto" Version="2.1.40-alpha" />
 	  <PackageReference Include="zxcvbn-core" Version="7.0.92" />
 	  <PackageReference Include="MessagePack.MSBuild.Tasks" Version="2.5.124">

src/Core/Lists/ItemViewModels/CustomFields/HiddenCustomFieldItemViewModel.cs

@@ -1,11 +1,7 @@
-using System;
+using System.Windows.Input;
-using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.View;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
 
 namespace Bit.App.Lists.ItemViewModels.CustomFields
 {
@@ -32,9 +28,9 @@ namespace Bit.App.Lists.ItemViewModels.CustomFields
             CopyFieldCommand = new Command(() => copyFieldCommand?.Execute(Field));
             ToggleHiddenValueCommand = CreateDefaultAsyncRelayCommand(ToggleHiddenValueAsync, null, ex =>
             {
-//#if !FDROID
+#if !FDROID
-//                Microsoft.AppCenter.Crashes.Crashes.TrackError(ex);
+                Microsoft.AppCenter.Crashes.Crashes.TrackError(ex);
-//#endif
+#endif
             });
         }
 

src/Core/Services/Logging/Logger.cs

@@ -1,23 +1,21 @@
 #if !FDROID
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-//using Microsoft.AppCenter;
+using Microsoft.AppCenter;
-//using Microsoft.AppCenter.Crashes;
+using Microsoft.AppCenter.Crashes;
 using Newtonsoft.Json;
 
 namespace Bit.Core.Services
 {
     public class Logger : ILogger
     {
-        private const string iOSAppSecret = "51f96ae5-68ba-45f6-99a1-8ad9f63046c3";
+#if IOS
-        private const string DroidAppSecret = "d3834185-b4a6-4347-9047-b86c65293d42";
+        private const string AppSecret = "51f96ae5-68ba-45f6-99a1-8ad9f63046c3";
+#else
+        private const string AppSecret = "d3834185-b4a6-4347-9047-b86c65293d42";
+#endif
 
         private string _userId;
         private string _appId;
@@ -40,7 +38,6 @@ namespace Bit.Core.Services
         {
         }
 
-
         public string Description
         {
             get
@@ -60,40 +57,27 @@ namespace Bit.Core.Services
                 return;
             }
 
-            var device = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService").GetDevice();
+            _userId = await ServiceContainer.Resolve<IStateService>().GetActiveUserIdAsync();
-            _userId = await ServiceContainer.Resolve<IStateService>("stateService").GetActiveUserIdAsync();
+            _appId = await ServiceContainer.Resolve<IAppIdService>().GetAppIdAsync();
-            _appId = await ServiceContainer.Resolve<IAppIdService>("appIdService").GetAppIdAsync();
 
-            // TODO: [Error-Reporting]
+            AppCenter.Start(AppSecret, typeof(Crashes));
-            //switch (device)
-            //{
-            //    case Enums.DeviceType.Android:
-            //        AppCenter.Start(DroidAppSecret, typeof(Crashes));
-            //        break;
-            //    case Enums.DeviceType.iOS:
-            //        AppCenter.Start(iOSAppSecret, typeof(Crashes));
-            //        break;
-            //    default:
-            //        throw new AppCenterException("Cannot start AppCenter. Device type is not configured.");
 
-            //}
+            AppCenter.SetUserId(_userId);
 
-            //AppCenter.SetUserId(_userId);
+            Crashes.GetErrorAttachments = (ErrorReport report) =>
-
+            {
-            //Crashes.GetErrorAttachments = (ErrorReport report) =>
+                return new ErrorAttachmentLog[]
-            //{
+                {
-            //    return new ErrorAttachmentLog[]
+                    ErrorAttachmentLog.AttachmentWithText(Description, "crshdesc.txt"),
-            //    {
+                };
-            //        ErrorAttachmentLog.AttachmentWithText(Description, "crshdesc.txt"),
+            };
-            //    };
-            //};
 
             _isInitialised = true;
         }
 
-        public async Task<bool> IsEnabled() => false;// await AppCenter.IsEnabledAsync();
+        public async Task<bool> IsEnabled() => await AppCenter.IsEnabledAsync();
 
-        public async Task SetEnabled(bool value) { }// await AppCenter.SetEnabledAsync(value);
+        public async Task SetEnabled(bool value) => await AppCenter.SetEnabledAsync(value);
 
         public void Error(string message,
                           IDictionary<string, string> extraData = null,
@@ -109,28 +93,28 @@ namespace Bit.Core.Services
                 ["Method"] = memberName
             };
 
-            //var exception = new Exception(message ?? $"Error found in: {classAndMethod}");
+            var exception = new Exception(message ?? $"Error found in: {classAndMethod}");
-            //if (extraData == null)
+            if (extraData == null)
-            //{
+            {
-            //    Crashes.TrackError(exception, properties);
+                Crashes.TrackError(exception, properties);
-            //}
+            }
-            //else
+            else
-            //{
+            {
-            //    var data = properties.Concat(extraData).ToDictionary(x => x.Key, x => x.Value);
+                var data = properties.Concat(extraData).ToDictionary(x => x.Key, x => x.Value);
-            //    Crashes.TrackError(exception, data);
+                Crashes.TrackError(exception, data);
-            //}
+            }
         }
 
         public void Exception(Exception exception)
         {
-            //try
+            try
-            //{
+            {
-            //    Crashes.TrackError(exception);
+                Crashes.TrackError(exception);
-            //}
+            }
-            //catch (Exception ex)
+            catch (Exception ex)
-            //{
+            {
-            //    Debug.WriteLine(ex.Message);
+                Debug.WriteLine(ex.Message);
-            //}
+            }
         }
     }
 }

src/Core/Services/Logging/LoggerHelper.cs

@@ -22,8 +22,7 @@ namespace Bit.Core.Services
 #if !FDROID
                 // just in case the caller throws the exception in a moment where the logger can't be resolved
                 // we need to track the error as well
-                // TODO: [Error-Reporting]
+                Microsoft.AppCenter.Crashes.Crashes.TrackError(ex);
-                //Microsoft.AppCenter.Crashes.Crashes.TrackError(ex);
 #endif
 
             }

src/Core/Services/Logging/StubLogger.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Runtime.CompilerServices;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using Bit.Core.Abstractions;
 
 namespace Bit.Core.Services

src/iOS.Autofill/iOS.Autofill.csproj

@@ -129,7 +129,7 @@
   <ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-    <!-- <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.2" /> -->
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
   </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\yubikey.png" />

src/iOS.Extension/iOS.Extension.csproj

@@ -107,7 +107,7 @@
   <ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-    <!-- <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.2" /> -->
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
   </ItemGroup>
   <ItemGroup>
     <BundleResource Update="Resources\yubikey%403x.png">

src/iOS.ShareExtension/iOS.ShareExtension.csproj

@@ -101,7 +101,7 @@
   <ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-    <!-- <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.2" /> -->
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />