From db05bfead351e1e44230d97ed7fbbcfa73b0582f Mon Sep 17 00:00:00 2001 From: Abhinav Date: Wed, 10 Jan 2024 18:11:46 +0530 Subject: [PATCH 1/3] fix value = 0 rejected in useLocalState --- packages/shared/hooks/useLocalState.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/hooks/useLocalState.tsx b/packages/shared/hooks/useLocalState.tsx index d50107921..98565c525 100644 --- a/packages/shared/hooks/useLocalState.tsx +++ b/packages/shared/hooks/useLocalState.tsx @@ -9,7 +9,7 @@ export function useLocalState( useEffect(() => { const { value } = getData(key) ?? {}; - if (value) { + if (typeof value !== 'undefined') { setValue(value); } }, []); From c81dfbf40bcbf42c6c37de7c3cca30921b2fab4a Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 11 Jan 2024 09:16:43 +0530 Subject: [PATCH 2/3] fix download manager not initialized on export start --- apps/photos/src/pages/_app.tsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/photos/src/pages/_app.tsx b/apps/photos/src/pages/_app.tsx index 99a1eef82..2aa73f340 100644 --- a/apps/photos/src/pages/_app.tsx +++ b/apps/photos/src/pages/_app.tsx @@ -62,6 +62,7 @@ import exportService from 'services/export'; import { REDIRECTS } from 'constants/redirects'; import { getLocalMapEnabled, + getToken, setLocalMapEnabled, } from '@ente/shared/storage/localStorage/helpers'; import { isExportInProgress } from 'utils/export'; @@ -76,6 +77,7 @@ import { useLocalState } from '@ente/shared/hooks/useLocalState'; import { PHOTOS_PAGES as PAGES } from '@ente/shared/constants/pages'; import { getTheme } from '@ente/shared/themes'; import { AppUpdateInfo } from '@ente/shared/electron/types'; +import DownloadManager from 'services/download'; const redirectMap = new Map([ [REDIRECTS.ROADMAP, getRoadmapRedirectURL], @@ -232,6 +234,14 @@ export default function App(props: EnteAppProps) { const initExport = async () => { try { addLogLine('init export'); + const token = getToken(); + if (!token) { + addLogLine( + 'User not logged in, not starting export continuous sync job' + ); + return; + } + DownloadManager.init(APPS.PHOTOS, { token }); const exportSettings = exportService.getExportSettings(); if (!exportService.exportFolderExists(exportSettings?.folder)) { return; From e25cd3b6619843a29df309431239ad8171cc7992 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 11 Jan 2024 09:47:53 +0530 Subject: [PATCH 3/3] fix missing await --- apps/photos/src/pages/_app.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/photos/src/pages/_app.tsx b/apps/photos/src/pages/_app.tsx index 2aa73f340..f60e541f8 100644 --- a/apps/photos/src/pages/_app.tsx +++ b/apps/photos/src/pages/_app.tsx @@ -241,7 +241,7 @@ export default function App(props: EnteAppProps) { ); return; } - DownloadManager.init(APPS.PHOTOS, { token }); + await DownloadManager.init(APPS.PHOTOS, { token }); const exportSettings = exportService.getExportSettings(); if (!exportService.exportFolderExists(exportSettings?.folder)) { return;