Skip to content

Colota - Android GPS Location tracker

fix: debounce service restart separately from settings persistence

Max Dietrichae9d178b1a7c
diff --git a/src/screens/ApiSettingsScreen.tsx b/src/screens/ApiSettingsScreen.tsx
index 21033a14..0a75cb8c 100644
--- a/src/screens/ApiSettingsScreen.tsx
+++ b/src/screens/ApiSettingsScreen.tsx
@@ -81,6 +81,7 @@ export function ApiSettingsScreen({}: ScreenProps) {
settings.apiTemplate || "custom"
);
const saveTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+ const restartTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const [saving, setSaving] = useState(false);
const [saveSuccess, setSaveSuccess] = useState(false);
@@ -130,11 +131,20 @@ export function ApiSettingsScreen({}: ScreenProps) {
};
await setSettings(newSettings);
- await restartTracking(newSettings);
- setSaving(false);
- setSaveSuccess(true);
- setTimeout(() => setSaveSuccess(false), 2000);
+ // Debounce the restart — only fires once after settings stabilize
+ if (restartTimeoutRef.current) clearTimeout(restartTimeoutRef.current);
+ restartTimeoutRef.current = setTimeout(async () => {
+ try {
+ await restartTracking(newSettings);
+ setSaveSuccess(true);
+ setTimeout(() => setSaveSuccess(false), 2000);
+ } catch (err) {
+ console.error("[ApiSettingsScreen] Restart failed:", err);
+ } finally {
+ setSaving(false);
+ }
+ }, 1500);
} catch (err) {
setSaving(false);
console.error("[ApiSettingsScreen] Failed to save settings:", err);
@@ -271,12 +281,11 @@ export function ApiSettingsScreen({}: ScreenProps) {
[localCustomFields, localFieldMap, localTemplate, saveAllSettings]
);
- // Cleanup timeout on unmount
+ // Cleanup timeouts on unmount
useEffect(() => {
return () => {
- if (saveTimeoutRef.current) {
- clearTimeout(saveTimeoutRef.current);
- }
+ if (saveTimeoutRef.current) clearTimeout(saveTimeoutRef.current);
+ if (restartTimeoutRef.current) clearTimeout(restartTimeoutRef.current);
};
}, []);
diff --git a/src/screens/AuthSettingsScreen.tsx b/src/screens/AuthSettingsScreen.tsx
index 4f8d64cd..cbb99e47 100644
--- a/src/screens/AuthSettingsScreen.tsx
+++ b/src/screens/AuthSettingsScreen.tsx
@@ -49,6 +49,7 @@ export function AuthSettingsScreen({}: ScreenProps) {
const [saving, setSaving] = useState(false);
const [saveSuccess, setSaveSuccess] = useState(false);
const saveTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+ const restartTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
// Load config on mount
useEffect(() => {
@@ -68,6 +69,7 @@ export function AuthSettingsScreen({}: ScreenProps) {
useEffect(() => {
return () => {
if (saveTimeoutRef.current) clearTimeout(saveTimeoutRef.current);
+ if (restartTimeoutRef.current) clearTimeout(restartTimeoutRef.current);
};
}, []);
@@ -76,13 +78,23 @@ export function AuthSettingsScreen({}: ScreenProps) {
setSaving(true);
try {
await NativeLocationService.saveAuthConfig(newConfig);
- await restartTracking(settings);
- setSaveSuccess(true);
- setTimeout(() => setSaveSuccess(false), 2000);
+
+ // Debounce the restart — only fires once after settings stabilize
+ if (restartTimeoutRef.current) clearTimeout(restartTimeoutRef.current);
+ restartTimeoutRef.current = setTimeout(async () => {
+ try {
+ await restartTracking(settings);
+ setSaveSuccess(true);
+ setTimeout(() => setSaveSuccess(false), 2000);
+ } catch (err) {
+ console.error("[AuthSettingsScreen] Restart failed:", err);
+ } finally {
+ setSaving(false);
+ }
+ }, AUTOSAVE_DEBOUNCE_MS);
} catch (err) {
- console.error("[AuthSettingsScreen] Save failed:", err);
- } finally {
setSaving(false);
+ console.error("[AuthSettingsScreen] Save failed:", err);
}
},
[restartTracking, settings]
diff --git a/src/screens/SettingsScreen.tsx b/src/screens/SettingsScreen.tsx
index 73df132d..01da3010 100644
--- a/src/screens/SettingsScreen.tsx
+++ b/src/screens/SettingsScreen.tsx
@@ -103,6 +103,7 @@ export function SettingsScreen({ navigation }: ScreenProps) {
const [showAdvanced, setShowAdvanced] = useState(false);
const saveTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+ const restartTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const advancedHeight = useRef(new Animated.Value(0)).current;
// Sync inputs with settings changes
@@ -138,21 +139,29 @@ export function SettingsScreen({ navigation }: ScreenProps) {
}
}, []);
- /** Save settings and restart tracking */
- const saveSettings = useCallback(
+ /** Persist settings to SQLite and schedule a debounced restart */
+ const saveAndRestart = useCallback(
async (newSettings: Settings) => {
setSaving(true);
try {
await setSettings(newSettings);
- await restartTracking(newSettings);
-
- setSaveSuccess(true);
- setTimeout(() => setSaveSuccess(false), 2000);
} catch (err) {
console.error("[SettingsScreen] Save failed", err);
- } finally {
- setSaving(false);
}
+
+ // Debounce the restart — only fires once after settings stabilize
+ if (restartTimeoutRef.current) clearTimeout(restartTimeoutRef.current);
+ restartTimeoutRef.current = setTimeout(async () => {
+ try {
+ await restartTracking(newSettings);
+ setSaveSuccess(true);
+ setTimeout(() => setSaveSuccess(false), 2000);
+ } catch (err) {
+ console.error("[SettingsScreen] Restart failed", err);
+ } finally {
+ setSaving(false);
+ }
+ }, AUTOSAVE_DEBOUNCE_MS);
},
[setSettings, restartTracking]
);
@@ -161,19 +170,19 @@ export function SettingsScreen({ navigation }: ScreenProps) {
(newSettings: Settings) => {
if (saveTimeoutRef.current) clearTimeout(saveTimeoutRef.current);
saveTimeoutRef.current = setTimeout(
- () => saveSettings(newSettings),
+ () => saveAndRestart(newSettings),
AUTOSAVE_DEBOUNCE_MS
);
},
- [saveSettings]
+ [saveAndRestart]
);
const immediateSave = useCallback(
(newSettings: Settings) => {
if (saveTimeoutRef.current) clearTimeout(saveTimeoutRef.current);
- saveSettings(newSettings);
+ saveAndRestart(newSettings);
},
- [saveSettings]
+ [saveAndRestart]
);
// Poll stats every 5 seconds
@@ -187,6 +196,7 @@ export function SettingsScreen({ navigation }: ScreenProps) {
useEffect(() => {
return () => {
if (saveTimeoutRef.current) clearTimeout(saveTimeoutRef.current);
+ if (restartTimeoutRef.current) clearTimeout(restartTimeoutRef.current);
};
}, []);
@@ -287,7 +297,7 @@ export function SettingsScreen({ navigation }: ScreenProps) {
const payload: Record<string, number | boolean> = {
[fieldMap.lat]: recentLocation.latitude,
[fieldMap.lon]: recentLocation.longitude,
- [fieldMap.acc]: recentLocation.accuracy,
+ [fieldMap.acc]: Math.round(recentLocation.accuracy),
};
if (fieldMap.alt) payload[fieldMap.alt] = 0;
@@ -305,6 +315,7 @@ export function SettingsScreen({ navigation }: ScreenProps) {
// proceed without auth headers
}
+ console.log(payload);
const response = await fetch(endpointInput, {
method: "POST",
headers: { "Content-Type": "application/json", ...authHeaders },