PWA: use only server attributes for serviceWorkerUpdateInterval

traccar · Nov 6, 2023 · 41b513e · 41b513e
1 parent f81bf48
commit 41b513e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/modern/src/UpdateController.tsx b/modern/src/UpdateController.tsx
@@ -2,14 +2,14 @@ import { Snackbar, IconButton } from '@mui/material';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import React from 'react'
 import { useTranslation } from './common/components/LocalizationProvider';
-import { useAttributePreference } from './common/util/preferences';
+import { useServerAttributePreference } from './common/util/preferences';
 import { useRegisterSW } from 'virtual:pwa-register/react'
 
 // Based on https://vite-pwa-org.netlify.app/frameworks/react.html
 function UpdateController() {
   const t = useTranslation();
 
-  const serviceWorkerUpdateInterval = useAttributePreference('serviceWorkerUpdateInterval', 3600000);
+  const serviceWorkerUpdateInterval = useServerAttributePreference('serviceWorkerUpdateInterval', 3600000);
 
   const {
     needRefresh: [needRefresh],

diff --git a/modern/src/common/util/preferences.js b/modern/src/common/util/preferences.js
@@ -39,3 +39,10 @@ export const useAttributePreference = (key, defaultValue) => useSelector((state)
   }
   return defaultValue;
 });
+
+export const useServerAttributePreference = (key, defaultValue) => useSelector((state) => {
+  if (containsProperty(state.session.server.attributes, key)) {
+    return state.session.server.attributes[key];
+  }
+  return defaultValue;
+});