Bug 1559448 - Move Thunderbird primary password prompt earlier in start-up. r=kaie,xpcom-reviewers,mccr8 DONTBUILD

Triggering the password prompt after the Add-Ons Manager start-up is causing the latter to fail.

I'm not sure if something needs to be unlocked by the password, or if the existence of the prompt is causing some bad interaction, but prompting slightly earlier appears to fix it.

Differential Revision: https://phabricator.services.mozilla.com/D106382

Author: darktrojan

toolkit/xre/nsAppRunner.cpp

@@ -242,11 +242,6 @@
 #include "mozilla/mozalloc_oom.h"
 #include "SafeMode.h"
 
-#ifdef MOZ_THUNDERBIRD
-#  include "nsIPK11TokenDB.h"
-#  include "nsIPK11Token.h"
-#endif
-
 #ifdef MOZ_BACKGROUNDTASKS
 #  include "mozilla/BackgroundTasks.h"
 #  include "nsIPowerManagerService.h"
@@ -5017,22 +5012,6 @@ nsresult XREMain::XRE_mainRun() {
 
     mDirProvider.DoStartup();
 
-#ifdef MOZ_THUNDERBIRD
-    if (Preferences::GetBool("security.prompt_for_master_password_on_startup",
-                             false)) {
-      // Prompt for the master password prior to opening application windows,
-      // to avoid the race that triggers multiple prompts (see bug 177175).
-      // We use this code until we have a better solution, possibly as
-      // described in bug 177175 comment 384.
-      nsCOMPtr<nsIPK11TokenDB> db =
-          do_GetService("@mozilla.org/security/pk11tokendb;1");
-      nsCOMPtr<nsIPK11Token> token;
-      if (NS_SUCCEEDED(db->GetInternalKeyToken(getter_AddRefs(token)))) {
-        Unused << token->Login(false);
-      }
-    }
-#endif
-
     // As FilePreferences need the profile directory, we must initialize right
     // here.
     mozilla::FilePreferences::InitDirectoriesWhitelist();

toolkit/xre/nsXREDirProvider.cpp

@@ -51,6 +51,11 @@
 #include "mozilla/XREAppData.h"
 #include "nsPrintfCString.h"
 
+#ifdef MOZ_THUNDERBIRD
+#  include "nsIPK11TokenDB.h"
+#  include "nsIPK11Token.h"
+#endif
+
 #include <stdlib.h>
 
 #ifdef XP_WIN
@@ -980,6 +985,22 @@ nsXREDirProvider::DoStartup() {
     mozilla::SandboxBroker::GeckoDependentInitialize();
 #endif
 
+#ifdef MOZ_THUNDERBIRD
+    if (mozilla::Preferences::GetBool(
+            "security.prompt_for_master_password_on_startup", false)) {
+      // Prompt for the master password prior to opening application windows,
+      // to avoid the race that triggers multiple prompts (see bug 177175).
+      // We use this code until we have a better solution, possibly as
+      // described in bug 177175 comment 384.
+      nsCOMPtr<nsIPK11TokenDB> db =
+          do_GetService("@mozilla.org/security/pk11tokendb;1");
+      nsCOMPtr<nsIPK11Token> token;
+      if (NS_SUCCEEDED(db->GetInternalKeyToken(getter_AddRefs(token)))) {
+        mozilla::Unused << token->Login(false);
+      }
+    }
+#endif
+
     bool initExtensionManager =
 #ifdef MOZ_BACKGROUNDTASKS
         !mozilla::BackgroundTasks::IsBackgroundTaskMode();