From a0a5e30f48f56365e8301367a6bb90dbf8d45530 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 23 Jul 2019 09:08:16 -0400
Subject: [PATCH] re-work hockeyapp init

---
 src/Android/MainActivity.cs                            |  5 +----
 src/Android/Utilities/HockeyAppCrashManagerListener.cs |  6 +++++-
 .../Utilities/HockeyAppCrashManagerDelegate.cs         | 10 +++++++++-
 src/iOS.Core/Utilities/iOSCoreHelpers.cs               |  8 +-------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs
index 2e8480d87..d37ef173c 100644
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -30,8 +30,6 @@ namespace Bit.Droid
     [Register("com.x8bit.bitwarden.MainActivity")]
     public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
-        private const string HockeyAppId = "d3834185b4a643479047b86c65293d42";
-
         private IDeviceActionService _deviceActionService;
         private IMessagingService _messagingService;
         private IBroadcasterService _broadcasterService;
@@ -84,8 +82,7 @@ namespace Bit.Droid
 
 #if !FDROID
             var hockeyAppListener = new HockeyAppCrashManagerListener(_appIdService, _userService);
-            var hockeyAppTask = hockeyAppListener.InitAsync();
-            HockeyApp.Android.CrashManager.Register(this, HockeyAppId, hockeyAppListener);
+            var hockeyAppTask = hockeyAppListener.InitAsync(this);
 #endif
 
             Xamarin.Essentials.Platform.Init(this, savedInstanceState);
diff --git a/src/Android/Utilities/HockeyAppCrashManagerListener.cs b/src/Android/Utilities/HockeyAppCrashManagerListener.cs
index 0fdcc4408..e7b490f2e 100644
--- a/src/Android/Utilities/HockeyAppCrashManagerListener.cs
+++ b/src/Android/Utilities/HockeyAppCrashManagerListener.cs
@@ -5,11 +5,14 @@ using Newtonsoft.Json;
 using Android.Runtime;
 using Bit.Core.Abstractions;
 using System.Threading.Tasks;
+using Android.Content;
 
 namespace Bit.Droid.Utilities
 {
     public class HockeyAppCrashManagerListener : CrashManagerListener
     {
+        private const string HockeyAppId = "d3834185b4a643479047b86c65293d42";
+
         private readonly IAppIdService _appIdService;
         private readonly IUserService _userService;
 
@@ -31,10 +34,11 @@ namespace Bit.Droid.Utilities
             _userService = userService;
         }
 
-        public async Task InitAsync()
+        public async Task InitAsync(Context context)
         {
             _userId = await _userService.GetUserIdAsync();
             _appId = await _appIdService.GetAppIdAsync();
+            CrashManager.Register(context, HockeyAppId, this);
         }
 
         public override string Description
diff --git a/src/iOS.Core/Utilities/HockeyAppCrashManagerDelegate.cs b/src/iOS.Core/Utilities/HockeyAppCrashManagerDelegate.cs
index e85b2c87a..e700ea5cd 100644
--- a/src/iOS.Core/Utilities/HockeyAppCrashManagerDelegate.cs
+++ b/src/iOS.Core/Utilities/HockeyAppCrashManagerDelegate.cs
@@ -7,6 +7,8 @@ namespace Bit.iOS.Core.Utilities
 {
     public class HockeyAppCrashManagerDelegate : BITCrashManagerDelegate
     {
+        private const string HockeyAppId = "51f96ae568ba45f699a18ad9f63046c3";
+
         private readonly IAppIdService _appIdService;
         private readonly IUserService _userService;
 
@@ -21,11 +23,17 @@ namespace Bit.iOS.Core.Utilities
             _userService = userService;
         }
 
-        public async Task InitAsync(BITHockeyManager manager)
+        public async Task InitAsync()
         {
             _userId = await _userService.GetUserIdAsync();
             _appId = await _appIdService.GetAppIdAsync();
+            var manager = BITHockeyManager.SharedHockeyManager;
+            manager.Configure(HockeyAppId, this);
+            manager.CrashManager.CrashManagerStatus = BITCrashManagerStatus.AutoSend;
             manager.UserId = _userId;
+            manager.Authenticator.AuthenticateInstallation();
+            manager.DisableMetricsManager = manager.DisableFeedbackManager = manager.DisableUpdateManager = true;
+            manager.StartManager();
         }
 
         public override string ApplicationLogForCrashManager(BITCrashManager crashManager)
diff --git a/src/iOS.Core/Utilities/iOSCoreHelpers.cs b/src/iOS.Core/Utilities/iOSCoreHelpers.cs
index be1a04a76..224bb1758 100644
--- a/src/iOS.Core/Utilities/iOSCoreHelpers.cs
+++ b/src/iOS.Core/Utilities/iOSCoreHelpers.cs
@@ -26,13 +26,7 @@ namespace Bit.iOS.Core.Utilities
             var crashManagerDelegate = new HockeyAppCrashManagerDelegate(
                 ServiceContainer.Resolve<IAppIdService>("appIdService"),
                 ServiceContainer.Resolve<IUserService>("userService"));
-            var manager = BITHockeyManager.SharedHockeyManager;
-            manager.Configure("51f96ae568ba45f699a18ad9f63046c3", crashManagerDelegate);
-            manager.CrashManager.CrashManagerStatus = BITCrashManagerStatus.AutoSend;
-            manager.StartManager();
-            manager.Authenticator.AuthenticateInstallation();
-            manager.DisableMetricsManager = manager.DisableFeedbackManager = manager.DisableUpdateManager = true;
-            var task = crashManagerDelegate.InitAsync(manager);
+            var task = crashManagerDelegate.InitAsync();
         }
 
         public static void RegisterLocalServices()