From 59a150b7bc8b6cd7e3c7851330341a4c03630784 Mon Sep 17 00:00:00 2001 From: orfelorfel23 Date: Thu, 11 Jun 2026 10:25:29 +0200 Subject: [PATCH] fix: replace deprecated BackHandler.removeEventListener with subscription.remove() to prevent crash on unmount --- src/screens/AdminScreen.tsx | 4 ++-- src/screens/PreviewScreen.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/screens/AdminScreen.tsx b/src/screens/AdminScreen.tsx index 0bd34e70..8d9068d8 100644 --- a/src/screens/AdminScreen.tsx +++ b/src/screens/AdminScreen.tsx @@ -125,8 +125,8 @@ export default function AdminScreen({ currentSettings, onSave, onClose }: AdminS return true; // Prevent default }; - BackHandler.addEventListener('hardwareBackPress', onBackPress); - return () => BackHandler.removeEventListener('hardwareBackPress', onBackPress); + const subscription = BackHandler.addEventListener('hardwareBackPress', onBackPress); + return () => subscription.remove(); }, [ countdown, printerIp, password, kioskActive, frameMode, selectedFrameId, availableFrameIds, dateOverlay, dateOverlayPosition, eventText, burstCount, burstInterval, welcomeText, diff --git a/src/screens/PreviewScreen.tsx b/src/screens/PreviewScreen.tsx index 312b1eb6..96f410a0 100644 --- a/src/screens/PreviewScreen.tsx +++ b/src/screens/PreviewScreen.tsx @@ -103,9 +103,9 @@ export default function PreviewScreen({ onReset(); return true; // Prevent default behavior (closing the app) }; - BackHandler.addEventListener('hardwareBackPress', onBackPress); + const subscription = BackHandler.addEventListener('hardwareBackPress', onBackPress); return () => { - BackHandler.removeEventListener('hardwareBackPress', onBackPress); + subscription.remove(); }; }, [onReset]);