[PM-13312] Task scheduler loses event callback reference when popout …

…opens (#11492) * [PM-13312] Task scheduler loses event callback reference when popout opens * [PM-13312] Task scheduler loses event callback reference when popout opens
bitwarden · Oct 10, 2024 · c221efd · c221efd
1 parent 14d71e7
commit c221efd
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
@@ -563,8 +563,14 @@ const safeProviders: SafeProvider[] = [
   }),
   safeProvider({
     provide: ForegroundTaskSchedulerService,
-    useFactory: getBgService<ForegroundTaskSchedulerService>("taskSchedulerService"),
-    deps: [],
+    useFactory: (logService: LogService, stateProvider: StateProvider) => {
+      if (needsBackgroundInit) {
+        return getBgService<ForegroundTaskSchedulerService>("taskSchedulerService")();
+      }
+
+      return new ForegroundTaskSchedulerService(logService, stateProvider);
+    },
+    deps: [LogService, StateProvider],
   }),
   safeProvider({
     provide: AnonLayoutWrapperDataService,